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

[SSE] fixed bug 32671

Browse source
This commit is contained in:
Julia Radzhabova 2016-07-22 18:27:22 +03:00
parent cb45250805
commit cbc70b1c38
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/common/main/lib/extend/Bootstrap.js
View file

@ -49,12 +49,14 @@ function onDropDownKeyDown(e) {
if ($parent.hasClass('no-stop-propagate')) { if ($parent.hasClass('no-stop-propagate')) {
if (arguments.length>1 && arguments[1] instanceof KeyboardEvent) if (arguments.length>1 && arguments[1] instanceof KeyboardEvent)
e = arguments[1]; e = arguments[1];
if ( /^(38|40|27|13|9)$/.test(e.keyCode) && !e.ctrlKey && !e.altKey) { if ( /^(38|40|27|13|9|37|39)$/.test(e.keyCode) && !e.ctrlKey && !e.altKey) {
patchDropDownKeyDownAdditional.call(this, e); patchDropDownKeyDownAdditional.call(this, e);
e.preventDefault(); if (!/(37|39)/.test(e.keyCode)) {
e.stopPropagation(); e.preventDefault();
e.stopPropagation();
}
} }
} else if ( !$parent.hasClass('no-stop-propagate') || /^(38|40|27|13|9)$/.test(e.keyCode) && !e.ctrlKey && !e.altKey) { } else {
patchDropDownKeyDown.call(this, e); patchDropDownKeyDown.call(this, e);
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
@ -142,15 +144,17 @@ function patchDropDownKeyDownAdditional(e) { // only for formula menu when typin
var $this = $(this); var $this = $(this);
e.preventDefault(); if (!/(37|39)/.test(e.keyCode)) {
e.stopPropagation(); e.preventDefault();
e.stopPropagation();
}
if ($this.is('.disabled, :disabled')) return; if ($this.is('.disabled, :disabled')) return;
var $parent = getParent($this); var $parent = getParent($this);
var isActive = $parent.hasClass('open') || $parent.hasClass('over'); var isActive = $parent.hasClass('open') || $parent.hasClass('over');
if (!isActive || (isActive && e.keyCode == 27)) { if (!isActive || (isActive && (e.keyCode == 27 || e.keyCode == 37 || e.keyCode == 39))) {
// if (e.which == 27) // if (e.which == 27)
// $parent.find('[data-toggle=dropdown]').focus(); // $parent.find('[data-toggle=dropdown]').focus();
return (isActive) ? $this.click() : undefined; return (isActive) ? $this.click() : undefined;

5
apps/spreadsheeteditor/main/app/controller/CellEditor.js
View file

@ -95,11 +95,12 @@ define([
onInputKeyDown: function(e) { onInputKeyDown: function(e) {
if (Common.UI.Keys.UP === e.keyCode || Common.UI.Keys.DOWN === e.keyCode || if (Common.UI.Keys.UP === e.keyCode || Common.UI.Keys.DOWN === e.keyCode ||
Common.UI.Keys.TAB === e.keyCode || Common.UI.Keys.RETURN === e.keyCode || Common.UI.Keys.ESC === e.keyCode) { Common.UI.Keys.TAB === e.keyCode || Common.UI.Keys.RETURN === e.keyCode || Common.UI.Keys.ESC === e.keyCode ||
Common.UI.Keys.LEFT === e.keyCode || Common.UI.Keys.RIGHT === e.keyCode) {
var menu = $('#menu-formula-selection'); // for formula menu var menu = $('#menu-formula-selection'); // for formula menu
if (menu.hasClass('open')) if (menu.hasClass('open'))
menu.find('.dropdown-menu').trigger('keydown', e); menu.find('.dropdown-menu').trigger('keydown', e);
} }
}, },
onLaunch: function() { onLaunch: function() {