diff options
| author | Callum Macrae <callum@lynxphp.com> | 2011-10-22 17:07:00 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:09:21 +0200 |
| commit | e0d6814772ce8f7d7f27ecaba66b5ee15b8f9e29 (patch) | |
| tree | 23bb5483d722d6ddbb95c01e0e65861ef08fb84e | |
| parent | cdfd746a259a7494713b079d5ba2e25774a01785 (diff) | |
| download | forums-e0d6814772ce8f7d7f27ecaba66b5ee15b8f9e29.tar forums-e0d6814772ce8f7d7f27ecaba66b5ee15b8f9e29.tar.gz forums-e0d6814772ce8f7d7f27ecaba66b5ee15b8f9e29.tar.bz2 forums-e0d6814772ce8f7d7f27ecaba66b5ee15b8f9e29.tar.xz forums-e0d6814772ce8f7d7f27ecaba66b5ee15b8f9e29.zip | |
[ticket/10270] Fixed a bug with the close button in phpbb.confirm.
PHPBB3-10270
| -rw-r--r-- | phpBB/assets/javascript/core.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 2f677bbbcb..a1447af491 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -61,6 +61,7 @@ phpbb.alert = function(title, msg, fadedark) { return true; }); dark.one('click', function(e) { + div.find('.alert_close').unbind('click'); var fade = (typeof fadedark !== 'undefined' && !fadedark) ? div : dark; fade.fadeOut(phpbb.alert_time, function() { div.hide(); @@ -135,6 +136,7 @@ phpbb.confirm = function(msg, callback, fadedark) { }); dark.one('click', function(e) { + div.find('.alert_close').unbind('click'); var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark; fade.fadeOut(phpbb.alert_time, function() { div.hide(); @@ -155,7 +157,11 @@ phpbb.confirm = function(msg, callback, fadedark) { }); div.find('.alert_close').one('click', function() { - dark.trigger('click'); + var fade = (typeof fadedark !== 'undefined' && fadedark) ? div : dark; + fade.fadeOut(phpbb.alert_time, function() { + div.hide(); + }); + callback(false); }); if (loading_alert.is(':visible')) |