Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 37199

Browse source
This commit is contained in:
Julia Radzhabova 2018-03-12 15:34:11 +03:00
parent bc30e303da
commit db112968a5
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/common/main/lib/component/Layout.js
View file

@ -370,7 +370,7 @@ define([
setResizeValue: function (index, value) { setResizeValue: function (index, value) {
if (index >= this.splitters.length) if (index >= this.splitters.length)
return; return false;
var panel = null, next = null, oldValue = 0, var panel = null, next = null, oldValue = 0,
resize = this.splitters[index].resizer, resize = this.splitters[index].resizer,
@ -405,6 +405,7 @@ define([
if (resize.value != value) { if (resize.value != value) {
this.doLayout(); this.doLayout();
} }
return (Math.abs(oldValue-value)>0.99);
} }
}); });

6
apps/common/main/lib/view/Chat.js
View file

@ -389,6 +389,7 @@ define([
if (event && 0 == textBox.val().length) { if (event && 0 == textBox.val().length) {
this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, height - this.addMessageBoxHeight)); this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, height - this.addMessageBoxHeight));
this.textBoxAutoSizeLocked = undefined; this.textBoxAutoSizeLocked = undefined;
this.updateScrolls();
return; return;
} }
@ -409,9 +410,8 @@ define([
height = this.panelBox.height(); height = this.panelBox.height();
this.layout.setResizeValue(1, if (this.layout.setResizeValue(1, Math.max(this.addMessageBoxHeight, Math.min(height - contentHeight - textBoxMinHeightIndent, height - this.addMessageBoxHeight))))
Math.max(this.addMessageBoxHeight, this.updateScrolls(); // update when resize position changed
Math.min(height - contentHeight - textBoxMinHeightIndent, height - this.addMessageBoxHeight)));
}, },
updateScrolls: function () { updateScrolls: function () {