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

Merge pull request #653 from ONLYOFFICE/feature/bug-48260

Browse source 
Feature/bug 48260
This commit is contained in:
Julia Radzhabova 2021-01-16 19:05:57 +03:00 committed by GitHub
parent 499a033585 43997a0c4e
commit 77574d2135
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -360,15 +360,15 @@ define([
return false; return false;
} }
else if (e.keyCode == Common.UI.Keys.RETURN && (this.editable || this.isMenuOpen())) { else if (e.keyCode == Common.UI.Keys.RETURN && (this.editable || this.isMenuOpen())) {
var isopen = this.isMenuOpen();
$(e.target).click(); $(e.target).click();
var me = this;
if (this.rendered) { if (this.rendered) {
if (Common.Utils.isIE) if (Common.Utils.isIE)
this._input.trigger('change', { onkeydown: true }); this._input.trigger('change', { onkeydown: true });
else else
this._input.blur(); this._input.blur();
} }
return false; return !isopen;
} }
else if (e.keyCode == Common.UI.Keys.ESC && this.isMenuOpen()) { else if (e.keyCode == Common.UI.Keys.ESC && this.isMenuOpen()) {
this._input.val(this.lastValue); this._input.val(this.lastValue);

2
apps/common/main/lib/component/ComboBoxFonts.js
View file

@ -131,6 +131,8 @@ define([
if ($(e.target).closest('input').length) { // enter in input field if ($(e.target).closest('input').length) { // enter in input field
if (this.lastValue !== this._input.val()) if (this.lastValue !== this._input.val())
this._input.trigger('change'); this._input.trigger('change');
else
return true;
} else { // enter in dropdown list } else { // enter in dropdown list
$(e.target).click(); $(e.target).click();
if (this.rendered) { if (this.rendered) {

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

@ -548,8 +548,15 @@ define([
}) })
.on('changed:after', _.bind(function(combo, record) { .on('changed:after', _.bind(function(combo, record) {
if (me._changedProps) { if (me._changedProps) {
if (combo.getSelectedRecord()) {
me._changedProps.put_XAlign(record.value);
} else {
var number = Common.Utils.String.parseFloat(record.value);
if (!isNaN(number)) {
me._changedProps.put_XAlign(undefined); me._changedProps.put_XAlign(undefined);
me._changedProps.put_X(Common.Utils.Metric.fnRecalcToMM(Common.Utils.String.parseFloat(record.value))); me._changedProps.put_X(Common.Utils.Metric.fnRecalcToMM(number));
}
}
} }
}, me)) }, me))
.on('selected', _.bind(function(combo, record) { .on('selected', _.bind(function(combo, record) {
@ -593,9 +600,16 @@ define([
}) })
.on('changed:after', _.bind(function(combo, record) { .on('changed:after', _.bind(function(combo, record) {
if (me._changedProps) { if (me._changedProps) {
if (combo.getSelectedRecord()) {
me._changedProps.put_YAlign(record.value);
} else {
var number = Common.Utils.String.parseFloat(record.value);
if (!isNaN(number)) {
me._changedProps.put_YAlign(undefined); me._changedProps.put_YAlign(undefined);
me._changedProps.put_Y(Common.Utils.Metric.fnRecalcToMM(Common.Utils.String.parseFloat(record.value))); 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) {
if (me._changedProps) { if (me._changedProps) {