makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-27 04:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13018] Do not handle events in close function.

Browse source 
PHPBB3-13018
This commit is contained in:
Cesar G 2014-09-15 07:43:18 -07:00
parent 5034b3ad7d
commit 2b4807b116
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,9 @@ phpbb.alert = function(title, msg, fadedark) {
$(document).on('keydown.phpbb.alert', function(e) { $(document).on('keydown.phpbb.alert', function(e) {
if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) { 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); phpbb.alert.open($alert);
@ -118,11 +120,14 @@ phpbb.alert.open = function($alert) {
}); });
$dark.one('click', function(e) { $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) { $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 jQuery $alert jQuery object.
* @param bool fadedark Whether to remove dark background. * @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; var $fade = (fadedark) ? $dark : $alert;
$fade.fadeOut(phpbb.alertTime, function() { $fade.fadeOut(phpbb.alertTime, function() {
@ -143,13 +146,6 @@ phpbb.alert.close = function($alert, fadedark, event, stopPropagation) {
$alert.find('.alert_close').off('click'); $alert.find('.alert_close').off('click');
$(document).off('keydown.phpbb.alert'); $(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); callback(true);
} }
$confirmDiv.find('input[type="button"]').off('click.phpbb.confirmbox'); $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); phpbb.alert.open($confirmDiv);