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

Fix fonts combobox

Browse source
This commit is contained in:
Julia Radzhabova 2020-10-02 14:55:27 +03:00
parent f6b7b82b07
commit 8b41402a53
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -105,14 +105,17 @@ define([
render : function(parentEl) { render : function(parentEl) {
var oldRawValue = null; var oldRawValue = null;
var oldTabindex = '';
if (!_.isUndefined(this._input)) { if (!_.isUndefined(this._input)) {
oldRawValue = this._input.val(); oldRawValue = this._input.val();
oldTabindex = this._input.attr('tabindex');
} }
Common.UI.ComboBox.prototype.render.call(this, parentEl); Common.UI.ComboBox.prototype.render.call(this, parentEl);
this.setRawValue(oldRawValue); this.setRawValue(oldRawValue);
this._input.attr('tabindex', oldTabindex);
this._input.on('keyup', _.bind(this.onInputKeyUp, this)); this._input.on('keyup', _.bind(this.onInputKeyUp, this));
this._input.on('keydown', _.bind(this.onInputKeyDown, this)); this._input.on('keydown', _.bind(this.onInputKeyDown, this));
@ -199,7 +202,7 @@ define([
me.closeMenu(); me.closeMenu();
me.onAfterHideMenu(e); me.onAfterHideMenu(e);
}, 10); }, 10);
} else if (e.keyCode != Common.UI.Keys.RETURN && e.keyCode != Common.UI.Keys.CTRL && e.keyCode != Common.UI.Keys.SHIFT && e.keyCode != Common.UI.Keys.ALT){ } else if (e.keyCode != Common.UI.Keys.RETURN && e.keyCode != Common.UI.Keys.CTRL && e.keyCode != Common.UI.Keys.SHIFT && e.keyCode != Common.UI.Keys.ALT && e.keyCode != Common.UI.Keys.TAB){
if (!this.isMenuOpen() && !e.ctrlKey) if (!this.isMenuOpen() && !e.ctrlKey)
this.openMenu(); this.openMenu();