IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed query tool keyboard issue where arrow keys were not behaving as expected for execute options dropdown. Fixes #3298

Browse Source
This commit is contained in:
Aditya Toshniwal
2018-05-09 13:05:22 +05:30
committed by Akshay Joshi
parent 5960644bae
commit 5b86a67a41
3 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
web/pgadmin/static/js/keyboard_shortcuts.js
View File

@@ -11,7 +11,11 @@ import $ from 'jquery';
const PERIOD_KEY = 190,
FWD_SLASH_KEY = 191,
ESC_KEY = 27;
ESC_KEY = 27,
LEFT_KEY = 37,
UP_KEY = 38,
RIGHT_KEY = 39,
DOWN_KEY = 40;
function isMac() {
return window.navigator.platform.search('Mac') != -1;
@@ -171,8 +175,54 @@ function keyboardShortcutsQueryTool(
} else if(this.validateShortcutKeys(previousPanelKeys, event)) {
this._stopEventPropagation(event);
panel_id = this.getInnerPanel(sqlEditorController.container, 'left');
} else if(keyCode === UP_KEY || keyCode === DOWN_KEY) {
/*Apply only for dropdown*/
if($(event.target).closest('.dropdown-menu').length > 0) {
this._stopEventPropagation(event);
let currLi = $(event.target).closest('li');
/*close all the submenus on movement*/
$(event.target).closest('.dropdown-menu').find('.open').removeClass('open');
/*do not focus on divider*/
let isDivider = true;
while(isDivider) {
if(keyCode === UP_KEY) {
currLi = currLi.prev();
}
else if(keyCode === DOWN_KEY){
currLi = currLi.next();
}
if(!currLi.hasClass('divider')) {
isDivider = false;
}
}
currLi.find('a:first').focus();
}
} else if(keyCode === LEFT_KEY || keyCode === RIGHT_KEY) {
/*Apply only for dropdown*/
if($(event.target).closest('.dropdown-menu').length > 0) {
this._stopEventPropagation(event);
let currLi = $(event.target).closest('li');
if(keyCode === RIGHT_KEY) {
/*open submenu if any*/
if(currLi.hasClass('dropdown-submenu')){
currLi.addClass('open');
currLi = currLi.find('.dropdown-menu li:first-child');
}
} else if(keyCode === LEFT_KEY) {
/*close submenu*/
let currLiMenu = currLi.closest('.dropdown-menu');
if(currLiMenu.closest('.dropdown-submenu').length > 0) {
currLiMenu.closest('.dropdown-submenu').removeClass('open');
currLi = currLiMenu.closest('.dropdown-submenu');
}
}
currLi.find('a:first').focus();
}
}
return panel_id;
}