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

Ensure the user can use keyboard shortcuts after using button controls such as Cancel, Open and Save. Fixes #3054

Browse Source
This commit is contained in:
Murtuza Zabuawala 2018-01-29 13:43:35 +00:00 committed by Dave Page
parent 489349b4e9
commit bc836aa374
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1539,6 +1539,7 @@ define('tools.querytool', [
function() { function() {
// Do nothing as user do not want to save, just continue // Do nothing as user do not want to save, just continue
self.query_tool_obj.setValue(''); self.query_tool_obj.setValue('');
setTimeout(() => { self.query_tool_obj.focus(); }, 200);
}, },
function() { function() {
return true; return true;
@ -1568,6 +1569,7 @@ define('tools.querytool', [
if (self.history_collection) { if (self.history_collection) {
self.history_collection.reset(); self.history_collection.reset();
} }
setTimeout(() => { self.query_tool_obj.focus(); }, 200);
}, },
function() { function() {
return true; return true;
@ -2805,6 +2807,7 @@ define('tools.querytool', [
// Update the flag as new content is just loaded. // Update the flag as new content is just loaded.
self.is_query_changed = false; self.is_query_changed = false;
setTimeout(() => { self.gridView.query_tool_obj.focus(); }, 200);
}, },
error: function(e) { error: function(e) {
var errmsg = $.parseJSON(e.responseText).errormsg; var errmsg = $.parseJSON(e.responseText).errormsg;
@ -2845,6 +2848,7 @@ define('tools.querytool', [
// Update the flag as query is already saved. // Update the flag as query is already saved.
self.is_query_changed = false; self.is_query_changed = false;
setTimeout(() => { self.gridView.query_tool_obj.focus(); }, 200);
} }
self.trigger('pgadmin-sqleditor:loading-icon:hide'); self.trigger('pgadmin-sqleditor:loading-icon:hide');
if (self.close_on_save) { if (self.close_on_save) {
@ -3556,6 +3560,8 @@ define('tools.querytool', [
self.disable_tool_buttons(false); self.disable_tool_buttons(false);
alertify.alert(gettext('Cancel Query Error'), res.data.result); alertify.alert(gettext('Cancel Query Error'), res.data.result);
} }
is_query_running = false;
setTimeout(() => { self.gridView.query_tool_obj.focus(); }, 200);
}, },
error: function(e) { error: function(e) {
self.disable_tool_buttons(false); self.disable_tool_buttons(false);