makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12543] Only take over ENTER and ESC keys when alert box is active.
This commit is contained in:
Joas Schilling 2014-05-24 14:30:28 +02:00
commit 55aa5c8296
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/assets/javascript/core.js
View file

@ -84,8 +84,8 @@ phpbb.alert = function(title, msg, fadedark) {
e.stopPropagation(); e.stopPropagation();
}); });
$(document).bind('keydown', function(e) { $(document).keydown(function(e) {
if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) { if ((e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) && dark.is(':visible')) {
dark.trigger('click'); dark.trigger('click');
e.preventDefault(); e.preventDefault();