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

1) Fixed an issue where shortcut keys are not working with manage macro. Fixes #5908

Browse Source 
2) Fixed an issue where the cursor shifts its focus to the wrong window for all the query tool related model dialogs. Fixes #6161
This commit is contained in:
Rahul Shirsat
2021-04-09 12:41:13 +05:30
committed by Akshay Joshi
parent 1f4affcb1e
commit 49095ccba6
6 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
web/pgadmin/tools/sqleditor/static/js/sqleditor.js
View File

@@ -506,13 +506,23 @@ define('tools.querytool', [
transId = self.handler.transId;
if (!$container.hasClass('wcPanelTabContentHidden')) {
setTimeout(function () {
self.handler.gridView.query_tool_obj.focus();
}, 200);
// Trigger an event to update connection status flag
pgBrowser.Events.trigger(
'pgadmin:query_tool:panel:gain_focus:' + transId
);
let modal_list = ['fileSelectionDlg', 'createModeDlg',
'confirm', 'alert', 'confirmSave', 'newConnectionDialog',
'macroDialog'];
/* check the modals inside the sqleditor are open, if not,
focus on the editor instead. */
if(!SqlEditorUtils.isModalOpen(modal_list)) {
setTimeout(function () {
self.handler.gridView.query_tool_obj.focus();
}, 200);
// Trigger an event to update connection status flag
pgBrowser.Events.trigger(
'pgadmin:query_tool:panel:gain_focus:' + transId
);
}
}
});