aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-05-13 17:49:54 -0700
committerCesar G <prototech91@gmail.com>2014-05-13 17:49:54 -0700
commitbc31a0d2526a71cd819f9ac08e9fe2e8fb009de5 (patch)
treea8306080f6d836d682e3ea7897433fba64d42583
parentbec9b7c34e63c7485477fa1edc2f6330889cc699 (diff)
downloadforums-bc31a0d2526a71cd819f9ac08e9fe2e8fb009de5.tar
forums-bc31a0d2526a71cd819f9ac08e9fe2e8fb009de5.tar.gz
forums-bc31a0d2526a71cd819f9ac08e9fe2e8fb009de5.tar.bz2
forums-bc31a0d2526a71cd819f9ac08e9fe2e8fb009de5.tar.xz
forums-bc31a0d2526a71cd819f9ac08e9fe2e8fb009de5.zip
[ticket/12543] Only take over ENTER and ESC keys when alert box is active.
PHPBB3-12543
-rw-r--r--phpBB/assets/javascript/core.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index cd633ed2ae..5a1e5b678c 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -84,8 +84,8 @@ phpbb.alert = function(title, msg, fadedark) {
e.stopPropagation();
});
- $(document).bind('keydown', function(e) {
- if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) {
+ $(document).keydown(function(e) {
+ if ((e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) && dark.is(':visible')) {
dark.trigger('click');
e.preventDefault();