public inbox for [email protected]
help / color / mirror / Atom feedFrom: Pradip Parkale <[email protected]>
To: Akshay Joshi <[email protected]>
Cc: pgadmin-hackers <[email protected]>
Subject: Re: [pgAdmin][RM4206]: Grant wizard does not close when we press ESC key
Date: Tue, 7 Apr 2020 13:41:51 +0530
Message-ID: <CAJ9T6Ss9hAgAufX8HvxAuAn6SW_M9D64=CtNRMxMrOW61a5a3A@mail.gmail.com> (raw)
In-Reply-To: <CANxoLDfkLmDMkbYby8xcqGZtC3psZzsT2Sei=CVVOe1fN5W28g@mail.gmail.com>
References: <CAJ9T6StCPjdwH=OxgBpEGdmbSFJmQ6SUNN0SaLZ0MZGxOdpNbw@mail.gmail.com>
<CANxoLDfkLmDMkbYby8xcqGZtC3psZzsT2Sei=CVVOe1fN5W28g@mail.gmail.com>
Hi Akshay,
Please find the updated patch.
On Mon, Apr 6, 2020 at 3:26 PM Akshay Joshi <[email protected]>
wrote:
> Hi Pradip
>
> Patch not working, please check one more time.
>
> On Mon, Apr 6, 2020 at 2:20 PM Pradip Parkale <
> [email protected]> wrote:
>
>> Hi Hackers,
>>
>> Please find the attached patch to close the Grant Wizard when the ESC key
>> is pressed.
>>
>> --
>> Thanks & Regards,
>> Pradip Parkale
>> QMG, EnterpriseDB Corporation
>>
>
>
> --
> *Thanks & Regards*
> *Akshay Joshi*
>
> *Sr. Software Architect*
> *EnterpriseDB Software India Private Limited*
> *Mobile: +91 976-788-8246*
>
--
Thanks & Regards,
Pradip Parkale
QMG, EnterpriseDB Corporation
Attachments:
[application/octet-stream] RM4206_v2.patch (2.7K, 3-RM4206_v2.patch)
download | inline diff:
diff --git a/web/pgadmin/browser/static/js/wizard.js b/web/pgadmin/browser/static/js/wizard.js
index 3068572d1..080ae56f2 100644
--- a/web/pgadmin/browser/static/js/wizard.js
+++ b/web/pgadmin/browser/static/js/wizard.js
@@ -184,11 +184,10 @@ define([
/* OnLoad Callback */
this.onLoad();
-
setTimeout(function() {
var container = $(self.el);
commonUtils.findAndSetFocus(container);
- }, 100);
+ }, 500);
return this;
},
@@ -292,6 +291,9 @@ define([
} else if(event.target.tagName == 'TEXTAREA'){
$(firstWizardFooterBtn).focus();
}
+ } else if (event.keyCode === 27){
+ //close the wizard when esc key is pressed
+ $(wizardHeader).find('button.ajs-close').click();
}
},
enableDisableNext: function(disable) {
diff --git a/web/pgadmin/static/js/utils.js b/web/pgadmin/static/js/utils.js
index 86dae698e..3fde1678f 100644
--- a/web/pgadmin/static/js/utils.js
+++ b/web/pgadmin/static/js/utils.js
@@ -38,10 +38,10 @@ export function findAndSetFocus(container) {
.pgadmin-controls:first input:enabled,
.pgadmin-controls:first .btn:not(.toggle),
.ajs-commands:first,
- .CodeMirror-scroll`)
- .find('*[tabindex]:not([tabindex="-1"])');
+ .CodeMirror-scroll,
+ .pgadmin-wizard`)
+ .find('*[tabindex]:not([tabindex="-1"]),input:enabled');
}
-
if(first_el.length > 0) {
first_el[0].focus();
} else {
diff --git a/web/pgadmin/static/vendor/backgrid/backgrid-select-all.js b/web/pgadmin/static/vendor/backgrid/backgrid-select-all.js
index 4e0c5c48b..8cc11698b 100644
--- a/web/pgadmin/static/vendor/backgrid/backgrid-select-all.js
+++ b/web/pgadmin/static/vendor/backgrid/backgrid-select-all.js
@@ -95,10 +95,6 @@
onKeydown: function (e) {
var command = new Backgrid.Command(e);
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() ||
command.moveUp() || command.moveDown()) {
diff --git a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
index 6c581288b..cae2f7c3f 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
+++ b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
@@ -428,11 +428,6 @@ define([
});
},
- hooks: {
- onshow: function() {
- commonUtils.findAndSetFocus($(this.elements.body));
- },
- },
prepare: function() {
var that = this;
view thread (4+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected], [email protected]
Subject: Re: [pgAdmin][RM4206]: Grant wizard does not close when we press ESC key
In-Reply-To: <CAJ9T6Ss9hAgAufX8HvxAuAn6SW_M9D64=CtNRMxMrOW61a5a3A@mail.gmail.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox