diff options
| author | Cesar G <prototech91@gmail.com> | 2014-09-15 07:43:18 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-09-15 07:43:18 -0700 |
| commit | 2b4807b1162a3956e3d3f9752056657fb1678d24 (patch) | |
| tree | 5c2e6acfe0391db4a7fed3904b805bd2e896e5dc /phpBB/assets/javascript | |
| parent | 5034b3ad7db2c56d88da2cb62b141ff514db7b1f (diff) | |
| download | forums-2b4807b1162a3956e3d3f9752056657fb1678d24.tar forums-2b4807b1162a3956e3d3f9752056657fb1678d24.tar.gz forums-2b4807b1162a3956e3d3f9752056657fb1678d24.tar.bz2 forums-2b4807b1162a3956e3d3f9752056657fb1678d24.tar.xz forums-2b4807b1162a3956e3d3f9752056657fb1678d24.zip | |
[ticket/13018] Do not handle events in close function.
PHPBB3-13018
Diffstat (limited to 'phpBB/assets/javascript')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index de21cc9608..a06f00d8ae 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -81,7 +81,9 @@ phpbb.alert = function(title, msg, fadedark) { $(document).on('keydown.phpbb.alert', function(e) { if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) { - phpbb.alert.close($alert, true, e, true); + phpbb.alert.close($alert, true); + e.preventDefault(); + e.stopPropagation(); } }); phpbb.alert.open($alert); @@ -118,11 +120,14 @@ phpbb.alert.open = function($alert) { }); $dark.one('click', function(e) { - phpbb.alert.close($alert, true, e, true); + phpbb.alert.close($alert, true); + e.preventDefault(); + e.stopPropagation(); }); $alert.find('.alert_close').one('click', function(e) { - phpbb.alert.close($alert, true, e, false); + phpbb.alert.close($alert, true); + e.preventDefault(); }); }; @@ -131,10 +136,8 @@ phpbb.alert.open = function($alert) { * * @param jQuery $alert jQuery object. * @param bool fadedark Whether to remove dark background. -* @param object event Event object. -* @param bool stopPropagation Whether to stop event's propagation. */ -phpbb.alert.close = function($alert, fadedark, event, stopPropagation) { +phpbb.alert.close = function($alert, fadedark) { var $fade = (fadedark) ? $dark : $alert; $fade.fadeOut(phpbb.alertTime, function() { @@ -143,13 +146,6 @@ phpbb.alert.close = function($alert, fadedark, event, stopPropagation) { $alert.find('.alert_close').off('click'); $(document).off('keydown.phpbb.alert'); - - if (event) { - event.preventDefault(); - if (stopPropagation) { - event.stopPropagation(); - } - } }; /** @@ -188,7 +184,10 @@ phpbb.confirm = function(msg, callback, fadedark) { callback(true); } $confirmDiv.find('input[type="button"]').off('click.phpbb.confirmbox'); - phpbb.alert.close($confirmDiv, fadedark, e, true); + phpbb.alert.close($confirmDiv, fadedark); + + e.preventDefault(); + e.stopPropagation(); }); phpbb.alert.open($confirmDiv); |