From f5740393208fa80ebc43fb5ebd24dd17f3370c39 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Thu, 21 Dec 2017 09:55:34 +0100 Subject: [PATCH] Disable closing non-closable dialogs via ESC Close #2505 --- wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js index 6ab51b5e04..1fc97282a6 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js @@ -390,6 +390,7 @@ define( _dialogs.set(id, { backdropCloseOnClick: options.backdropCloseOnClick, + closable: options.closable, content: content, dialog: dialog, header: header, @@ -426,7 +427,7 @@ define( } if (elAttr(data.dialog, 'aria-hidden') === 'true') { - if (elAttr(_container, 'aria-hidden') === 'true') { + if (data.closable && elAttr(_container, 'aria-hidden') === 'true') { window.addEventListener('keyup', _keyupListener); } @@ -589,7 +590,9 @@ define( elAttr(_container, 'aria-hidden', 'true'); elData(_container, 'close-on-click', 'false'); - window.removeEventListener('keyup', _keyupListener); + if (data.closable) { + window.removeEventListener('keyup', _keyupListener); + } document.documentElement.classList.remove('pageOverlayActive'); } else { -- 2.20.1