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

11
web/pgadmin/static/js/sqleditor/macro.js
View File

@@ -63,6 +63,17 @@ let MacroDialog = {
className: 'btn btn-primary fa fa-save pg-alertify-button',
'data-btn-name': 'ok',
}],
focus: {
element: function(){
/*
returning false will focus nothing, but it will make
contents behind the modal accessible via Tab key,
so focus the dialog itself instead.
*/
return $(this.elements.dialog).find('.header-icon-cell button')[0];
},
select: true,
},
// Set options for dialog
options: {
title: title,

11
web/pgadmin/static/js/sqleditor/new_connection_dialog.js
View File

@@ -82,6 +82,17 @@ let NewConnectionDialog = {
'data-btn-name': 'ok',
},
],
focus: {
element: function(){
/*
returning false will focus nothing, but it will make
contents behind the modal accessible via Tab key,
so focus the dialog itself instead.
*/
return $(this.elements.dialog).find('.new-connection-dialog .nav-link.active.show');
},
select: true,
},
// Set options for dialog
options: {
title: title,

21
web/pgadmin/static/js/sqleditor_utils.js
View File

@@ -8,8 +8,8 @@
//////////////////////////////////////////////////////////////////////////
// This file contains common utilities functions used in sqleditor modules
define(['jquery', 'underscore', 'sources/gettext', 'sources/url_for'],
function ($, _, gettext, url_for) {
define(['jquery', 'underscore', 'sources/gettext', 'sources/url_for', 'pgadmin.alertifyjs'],
function ($, _, gettext, url_for, alertify) {
var sqlEditorUtils = {
/* Reference link http://stackoverflow.com/questions/105034/create-guid-uuid-in-javascript
* Modified as per requirement.
@@ -236,6 +236,23 @@ define(['jquery', 'underscore', 'sources/gettext', 'sources/url_for'],
};
}
},
isModalOpen: function(dialog_list) {
/* check the modals inside the sqleditor are open or not */
if(Array.isArray(dialog_list)) {
for(let d of dialog_list) {
try {
if(alertify.dialog(d) && alertify.dialog(d).isOpen())
return true;
}
catch (err) {
// Do nothing
console.warn(err.stack || err);
}
}
}
return false;
},
};
return sqlEditorUtils;
});