s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

moved escapeKey handler to global scope (to prevent only said handler from executing when a dialog is closed)

Browse Source
This commit is contained in:
Lisa Chandra 2020-02-29 22:16:29 +05:30
parent 07149d4083
commit e563885de1
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.js
View File

@ -289,7 +289,6 @@ function SqlExporterDialog(options) {
this._elmts.cancelButton.click(function() { self._dismiss(); }); this._elmts.cancelButton.click(function() { self._dismiss(); });
this._elmts.downloadButton.click(function() { self._download(); }); this._elmts.downloadButton.click(function() { self._download(); });
this._elmts.downloadPreviewButton.click(function(evt) { self._previewDownload(); }); this._elmts.downloadPreviewButton.click(function(evt) { self._previewDownload(); });
this._configureUIFromOptionCode(options); this._configureUIFromOptionCode(options);
this._updateOptionCode(); this._updateOptionCode();
}; };

18
main/webapp/modules/core/scripts/util/dialog.js
View File

@ -35,6 +35,13 @@ DialogSystem = {
_layers: [] _layers: []
}; };
var escapeKey = function(event) {
var level = DialogSystem._layers.length;
if (event.keyCode == 27) {
DialogSystem.dismissUntil(level - 1);
}
}
DialogSystem.showDialog = function(elmt, onCancel) { DialogSystem.showDialog = function(elmt, onCancel) {
var overlay = $('<div>&nbsp;</div>') var overlay = $('<div>&nbsp;</div>')
.addClass("dialog-overlay") .addClass("dialog-overlay")
@ -61,12 +68,6 @@ DialogSystem.showDialog = function(elmt, onCancel) {
var level = DialogSystem._layers.length; var level = DialogSystem._layers.length;
var escapeKey = function(event) {
if (event.keyCode == 27) {
DialogSystem.dismissUntil(level - 1);
}
}
$(window).keydown(escapeKey); $(window).keydown(escapeKey);
return level; return level;
@ -98,15 +99,12 @@ DialogSystem.dismissUntil = function(level) {
for (var i = DialogSystem._layers.length - 1; i >= level; i--) { for (var i = DialogSystem._layers.length - 1; i >= level; i--) {
DialogSystem.dismissLevel(i); DialogSystem.dismissLevel(i);
} }
$(window).off('keydown'); $(window).off('keydown', escapeKey);
DialogSystem._layers = DialogSystem._layers.slice(0, level); DialogSystem._layers = DialogSystem._layers.slice(0, level);
}; };
DialogSystem.createDialog = function() { DialogSystem.createDialog = function() {
return $('<div></div>').addClass("dialog-frame"); return $('<div></div>').addClass("dialog-frame");
}; };
DialogSystem.showBusy = function(message) { DialogSystem.showBusy = function(message) {