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

Ensure that the grant wizard should be closed on pressing the ESC key. Fixes #4206

Browse Source
This commit is contained in:
Pradip Parkale 2020-04-07 13:48:56 +05:30 committed by Akshay Joshi
parent d6bc3ccc8b
commit 33deacacee
5 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_21.rst
View File

@ -24,6 +24,7 @@ Bug fixes
| `Issue #3645 <https://redmine.postgresql.org/issues/3645>`_ - Ensure that the start and end date should be deleted when clear the selection for pgAgent Job. | `Issue #3645 <https://redmine.postgresql.org/issues/3645>`_ - Ensure that the start and end date should be deleted when clear the selection for pgAgent Job.
| `Issue #3988 <https://redmine.postgresql.org/issues/3988>`_ - Fixed cursor disappeared issue in the query editor for some of the characters when zoomed out. | `Issue #3988 <https://redmine.postgresql.org/issues/3988>`_ - Fixed cursor disappeared issue in the query editor for some of the characters when zoomed out.
| `Issue #4206 <https://redmine.postgresql.org/issues/4206>`_ - Ensure that the grant wizard should be closed on pressing the ESC key.
| `Issue #4512 <https://redmine.postgresql.org/issues/4512>`_ - Fixed calendar opening issue on the exception tab inside the schedules tab of pgAgent. | `Issue #4512 <https://redmine.postgresql.org/issues/4512>`_ - Fixed calendar opening issue on the exception tab inside the schedules tab of pgAgent.
| `Issue #5180 <https://redmine.postgresql.org/issues/5180>`_ - Fixed an issue where the autovacuum_enabled parameter is added automatically in the RE-SQL when the table has been created using the WITH clause. | `Issue #5180 <https://redmine.postgresql.org/issues/5180>`_ - Fixed an issue where the autovacuum_enabled parameter is added automatically in the RE-SQL when the table has been created using the WITH clause.
| `Issue #5268 <https://redmine.postgresql.org/issues/5268>`_ - Fixed generated SQL when any token in FTS Configuration or any option in FTS Dictionary is changed. | `Issue #5268 <https://redmine.postgresql.org/issues/5268>`_ - Fixed generated SQL when any token in FTS Configuration or any option in FTS Dictionary is changed.

6
web/pgadmin/browser/static/js/wizard.js
View File

@ -184,11 +184,10 @@ define([
/* OnLoad Callback */ /* OnLoad Callback */
this.onLoad(); this.onLoad();
setTimeout(function() { setTimeout(function() {
var container = $(self.el); var container = $(self.el);
commonUtils.findAndSetFocus(container); commonUtils.findAndSetFocus(container);
}, 100); }, 500);
return this; return this;
}, },
@ -292,6 +291,9 @@ define([
} else if(event.target.tagName == 'TEXTAREA'){ } else if(event.target.tagName == 'TEXTAREA'){
$(firstWizardFooterBtn).focus(); $(firstWizardFooterBtn).focus();
} }
} else if (event.keyCode === 27){
//close the wizard when esc key is pressed
$(wizardHeader).find('button.ajs-close').click();
} }
}, },
enableDisableNext: function(disable) { enableDisableNext: function(disable) {

6
web/pgadmin/static/js/utils.js
View File

@ -39,10 +39,10 @@ export function findAndSetFocus(container) {
.pgadmin-controls:first .btn:not(.toggle), .pgadmin-controls:first .btn:not(.toggle),
.pgadmin-controls:first, .pgadmin-controls:first,
.ajs-commands:first, .ajs-commands:first,
.CodeMirror-scroll`) .CodeMirror-scroll,
.find('*[tabindex]:not([tabindex="-1"])'); .pgadmin-wizard`)
.find('*[tabindex]:not([tabindex="-1"]),input:enabled');
} }
if(first_el.length > 0) { if(first_el.length > 0) {
first_el[0].focus(); first_el[0].focus();
} else { } else {

4
web/pgadmin/static/vendor/backgrid/backgrid-select-all.js vendored
View File

@ -95,10 +95,6 @@
onKeydown: function (e) { onKeydown: function (e) {
var command = new Backgrid.Command(e); var command = new Backgrid.Command(e);
if (command.passThru()) return true; // skip ahead to `change` if (command.passThru()) return true; // skip ahead to `change`
if (command.cancel()) {
e.stopPropagation();
this.checkbox().blur();
}
else if (command.save() || command.moveLeft() || command.moveRight() || else if (command.save() || command.moveLeft() || command.moveRight() ||
command.moveUp() || command.moveDown()) { command.moveUp() || command.moveDown()) {

5
web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
View File

@ -428,11 +428,6 @@ define([
}); });
}, },
hooks: {
onshow: function() {
commonUtils.findAndSetFocus($(this.elements.body));
},
},
prepare: function() { prepare: function() {
var that = this; var that = this;