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

For Bug 48260

Browse source
This commit is contained in:
Julia Radzhabova 2021-01-15 16:07:10 +03:00
parent 499a033585
commit 7ecb043d4d
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/common/main/lib/component/ComboBox.js
View file

@ -368,6 +368,11 @@ define([
else else
this._input.blur(); this._input.blur();
} }
if (!this.isMenuOpen()) {
if ((this.getRawValue() === this.lastValue))
return true;
this.setRawValue(this._input.val());
}
return false; return false;
} }
else if (e.keyCode == Common.UI.Keys.ESC && this.isMenuOpen()) { else if (e.keyCode == Common.UI.Keys.ESC && this.isMenuOpen()) {

16
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
View file

@ -548,8 +548,12 @@ define([
}) })
.on('changed:after', _.bind(function(combo, record) { .on('changed:after', _.bind(function(combo, record) {
if (me._changedProps) { if (me._changedProps) {
me._changedProps.put_XAlign(undefined); if (combo.getSelectedRecord()) {
me._changedProps.put_X(Common.Utils.Metric.fnRecalcToMM(Common.Utils.String.parseFloat(record.value))); me._changedProps.put_XAlign(record.value);
} else {
me._changedProps.put_XAlign(undefined);
me._changedProps.put_X(Common.Utils.Metric.fnRecalcToMM(Common.Utils.String.parseFloat(record.value)));
}
} }
}, me)) }, me))
.on('selected', _.bind(function(combo, record) { .on('selected', _.bind(function(combo, record) {
@ -593,8 +597,12 @@ define([
}) })
.on('changed:after', _.bind(function(combo, record) { .on('changed:after', _.bind(function(combo, record) {
if (me._changedProps) { if (me._changedProps) {
me._changedProps.put_YAlign(undefined); if (combo.getSelectedRecord()) {
me._changedProps.put_Y(Common.Utils.Metric.fnRecalcToMM(Common.Utils.String.parseFloat(record.value))); me._changedProps.put_YAlign(record.value);
} else {
me._changedProps.put_YAlign(undefined);
me._changedProps.put_Y(Common.Utils.Metric.fnRecalcToMM(Common.Utils.String.parseFloat(record.value)));
}
} }
}, me)) }, me))
.on('selected', _.bind(function(combo, record) { .on('selected', _.bind(function(combo, record) {