diff options
| author | Cesar G <prototech91@gmail.com> | 2014-09-14 15:49:18 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-09-14 15:49:18 -0700 |
| commit | 5034b3ad7db2c56d88da2cb62b141ff514db7b1f (patch) | |
| tree | c363823ef3315599f077bc050d1877e8df8a848d | |
| parent | 6d80770ba47bc232c422a82915863706252f052e (diff) | |
| download | forums-5034b3ad7db2c56d88da2cb62b141ff514db7b1f.tar forums-5034b3ad7db2c56d88da2cb62b141ff514db7b1f.tar.gz forums-5034b3ad7db2c56d88da2cb62b141ff514db7b1f.tar.bz2 forums-5034b3ad7db2c56d88da2cb62b141ff514db7b1f.tar.xz forums-5034b3ad7db2c56d88da2cb62b141ff514db7b1f.zip | |
[ticket/13018] Reduce the delta further.
The callback does not actually do anything when cancelling the confirmation
box so we can avoid calling it altogether when cancel is clicked.
PHPBB3-13018
| -rw-r--r-- | phpBB/assets/javascript/core.js | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 77f81358c8..de21cc9608 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -81,22 +81,9 @@ phpbb.alert = function(title, msg, fadedark) { $(document).on('keydown.phpbb.alert', function(e) { if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) { - closeBox(true, e, true); + phpbb.alert.close($alert, true, e, true); } }); - - $dark.one('click', function(e) { - closeBox(true, e, true); - }); - - $alert.find('.alert_close').one('click', function(e) { - closeBox(true, e, false); - }); - - var closeBox = function(fadedark, event, stopPropagation) { - phpbb.alert.close($alert, fadedark, event, stopPropagation); - }; - phpbb.alert.open($alert); return $alert; @@ -129,6 +116,14 @@ phpbb.alert.open = function($alert) { $alert.on('click', function(e) { e.stopPropagation(); }); + + $dark.one('click', function(e) { + phpbb.alert.close($alert, true, e, true); + }); + + $alert.find('.alert_close').one('click', function(e) { + phpbb.alert.close($alert, true, e, false); + }); }; /** @@ -188,22 +183,13 @@ phpbb.confirm = function(msg, callback, fadedark) { $confirmDiv.find('input[type="button"]').one('click.phpbb.confirmbox', function(e) { var confirmed = this.name === 'confirm', fadedark = fadedark || !confirmed; - closeBox(fadedark, confirmed, e, true); - }); - - $dark.one('click', function(e) { - closeBox(true, false, e, true); - }); - - $confirmDiv.find('.alert_close').one('click', function(e) { - closeBox(true, false, e, false); - }); - var closeBox = function(fadedark, confirmed, event, stopPropagation) { + if (confirmed) { + callback(true); + } $confirmDiv.find('input[type="button"]').off('click.phpbb.confirmbox'); - callback(confirmed); - phpbb.alert.close($confirmDiv, fadedark, event, stopPropagation); - }; + phpbb.alert.close($confirmDiv, fadedark, e, true); + }); phpbb.alert.open($confirmDiv); |