diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-24 14:30:28 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-24 14:30:28 +0200 |
| commit | 55aa5c829607e33b9cfe3eec654357cb3c5fa7a9 (patch) | |
| tree | d3f7e343e6d91a22fce1622fcb6943c20168c1bf /phpBB/assets/javascript/core.js | |
| parent | 4ef9334dba448ba98e29b8d833c4b3c2c79fdf31 (diff) | |
| parent | 1b73c217f0ba80e448bb3f34ffe8ed082fa5e99f (diff) | |
| download | forums-55aa5c829607e33b9cfe3eec654357cb3c5fa7a9.tar forums-55aa5c829607e33b9cfe3eec654357cb3c5fa7a9.tar.gz forums-55aa5c829607e33b9cfe3eec654357cb3c5fa7a9.tar.bz2 forums-55aa5c829607e33b9cfe3eec654357cb3c5fa7a9.tar.xz forums-55aa5c829607e33b9cfe3eec654357cb3c5fa7a9.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12543] Only take over ENTER and ESC keys when alert box is active.
Diffstat (limited to 'phpBB/assets/javascript/core.js')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 3cb41039cf..9eba80542c 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(); |