diff --git a/apps/common/main/lib/component/ComboBoxDataView.js b/apps/common/main/lib/component/ComboBoxDataView.js index cfa501c18e..bfd0f51074 100644 --- a/apps/common/main/lib/component/ComboBoxDataView.js +++ b/apps/common/main/lib/component/ComboBoxDataView.js @@ -207,6 +207,8 @@ define([ onBeforeKeyDown: function(menu, e) { if ((e.keyCode == Common.UI.Keys.DOWN || e.keyCode == Common.UI.Keys.SPACE) && !this.isMenuOpen()) { $('button', this.cmpEl).click(); + e.preventDefault(); + e.stopPropagation(); return false; } }, diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index a16fb2e5f0..3a1bc5e2b4 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -790,6 +790,8 @@ define([ onKeyDown: function (e, data) { if ( this.disabled ) return; if (data===undefined) data = e; + if (data.isDefaultPrevented()) + return; if(this.multiSelect) { if (data.keyCode == Common.UI.Keys.CTRL) { @@ -799,7 +801,7 @@ define([ } } - if (_.indexOf(this.moveKeys, data.keyCode)>-1 || data.keyCode==Common.UI.Keys.RETURN) { + if (_.indexOf(this.moveKeys, data.keyCode)>-1 || data.keyCode==Common.UI.Keys.RETURN) { data.preventDefault(); data.stopPropagation(); var rec =(this.multiSelect) ? this.extremeSeletedRec : this.getSelectedRec();