diff --git a/apps/common/main/lib/component/Layout.js b/apps/common/main/lib/component/Layout.js index c802f1a1a..4fe76c307 100644 --- a/apps/common/main/lib/component/Layout.js +++ b/apps/common/main/lib/component/Layout.js @@ -370,7 +370,7 @@ define([ setResizeValue: function (index, value) { if (index >= this.splitters.length) - return; + return false; var panel = null, next = null, oldValue = 0, resize = this.splitters[index].resizer, @@ -405,6 +405,7 @@ define([ if (resize.value != value) { this.doLayout(); } + return (Math.abs(oldValue-value)>0.99); } }); diff --git a/apps/common/main/lib/view/Chat.js b/apps/common/main/lib/view/Chat.js index 53c90cefb..8d5a6212a 100644 --- a/apps/common/main/lib/view/Chat.js +++ b/apps/common/main/lib/view/Chat.js @@ -389,6 +389,7 @@ define([ if (event && 0 == textBox.val().length) { this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, height - this.addMessageBoxHeight)); this.textBoxAutoSizeLocked = undefined; + this.updateScrolls(); return; } @@ -409,9 +410,8 @@ define([ height = this.panelBox.height(); - this.layout.setResizeValue(1, - Math.max(this.addMessageBoxHeight, - Math.min(height - contentHeight - textBoxMinHeightIndent, height - this.addMessageBoxHeight))); + if (this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, Math.min(height - contentHeight - textBoxMinHeightIndent, height - this.addMessageBoxHeight)))) + this.updateScrolls(); // update when resize position changed }, updateScrolls: function () {