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

Fix Bug 43396

Browse source
This commit is contained in:
Julia Radzhabova 2019-12-10 15:30:32 +03:00
parent b3943b592d
commit 95184bc8c7
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -355,6 +355,7 @@ define([
return false; return false;
} }
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.closeMenu(); this.closeMenu();
this.onAfterHideMenu(e); this.onAfterHideMenu(e);
return false; return false;
@ -420,6 +421,7 @@ define([
var me = this; var me = this;
if (e.keyCode == Common.UI.Keys.ESC){ if (e.keyCode == Common.UI.Keys.ESC){
this._input.val(this.lastValue);
this.closeMenu(); this.closeMenu();
this.onAfterHideMenu(e); this.onAfterHideMenu(e);
} else if (e.keyCode == Common.UI.Keys.UP || e.keyCode == Common.UI.Keys.DOWN) { } else if (e.keyCode == Common.UI.Keys.UP || e.keyCode == Common.UI.Keys.DOWN) {

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

@ -364,6 +364,9 @@ define([
} else { } else {
this._fromKeyDown = true; this._fromKeyDown = true;
} }
if (e.keyCode == Common.UI.Keys.ESC)
this.setRawValue(this.value);
if (e.keyCode==Common.UI.Keys.RETURN || e.keyCode==Common.UI.Keys.ESC) if (e.keyCode==Common.UI.Keys.RETURN || e.keyCode==Common.UI.Keys.ESC)
this.trigger('inputleave', this); this.trigger('inputleave', this);
}, },