diff options
| author | Christian Hofmaier | 2020-10-13 18:24:41 +0200 |
|---|---|---|
| committer | Christian Hofmaier | 2020-10-13 18:24:41 +0200 |
| commit | 6ef48b756c51e33f64f74fc9fdd96c9e6f4ff1c0 (patch) | |
| tree | 1b25330880065efa168cb5c69773d545df7cfc01 /script/slx-fixes.js | |
| parent | [locationinfo] add forward link to location module (diff) | |
| parent | [dozmod] Implement deleting orphaned files from vm store (diff) | |
| download | slx-admin-6ef48b756c51e33f64f74fc9fdd96c9e6f4ff1c0.tar.gz slx-admin-6ef48b756c51e33f64f74fc9fdd96c9e6f4ff1c0.tar.xz slx-admin-6ef48b756c51e33f64f74fc9fdd96c9e6f4ff1c0.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/slx-admin
merge branch 'master'
Diffstat (limited to 'script/slx-fixes.js')
| -rw-r--r-- | script/slx-fixes.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/script/slx-fixes.js b/script/slx-fixes.js index 992ca337..a06761e4 100644 --- a/script/slx-fixes.js +++ b/script/slx-fixes.js @@ -61,6 +61,7 @@ $(document).ready(function() { var $title, $body, $button, $modal = null, $cache = {}; slxModalConfirmHandler = function (e) { e.preventDefault(); + e.stopImmediatePropagation(); var $this = $(this); if ($modal === null) { $modal = $('<div class="modal fade" id="modal-autogen" tabindex="-1" role="dialog"><div class="modal-dialog" role="document"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal">×</button>' @@ -74,7 +75,7 @@ $(document).ready(function() { $title.text($this.data('title') || $this.text()); $button.html($this.data('close') || $this.html()).attr('class', $this.attr('class')).removeClass('btn-xs btn-sm btn-lg').off('click').click(function() { // Click and reconnect click handler so pressing "back" on the next page works - $this.off('click').click().click(slxModalConfirmHandler); + $this.off('click', slxModalConfirmHandler).click().click(slxModalConfirmHandler); }); var $wat, str = $this.data('confirm'); if (str.substr(0, 9) === '#confirm-') { |