diff options
| author | Cesar G <prototech91@gmail.com> | 2014-09-15 07:44:02 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-09-15 07:44:02 -0700 |
| commit | 4ae447b20500f3122e7ff57c365bc699ef932e85 (patch) | |
| tree | 6c73b8e0ae91fd2e4a9faedd47bbf33c6828cd8b /phpBB | |
| parent | 2b4807b1162a3956e3d3f9752056657fb1678d24 (diff) | |
| download | forums-4ae447b20500f3122e7ff57c365bc699ef932e85.tar forums-4ae447b20500f3122e7ff57c365bc699ef932e85.tar.gz forums-4ae447b20500f3122e7ff57c365bc699ef932e85.tar.bz2 forums-4ae447b20500f3122e7ff57c365bc699ef932e85.tar.xz forums-4ae447b20500f3122e7ff57c365bc699ef932e85.zip | |
[ticket/13018] Clean up and fix some logic.
PHPBB3-13018
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index a06f00d8ae..5fe78cf052 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -164,7 +164,7 @@ phpbb.alert.close = function($alert, fadedark) { phpbb.confirm = function(msg, callback, fadedark) { var $confirmDiv = $('#phpbb_confirm'); $confirmDiv.find('.alert_text').html(msg); - fadedark = (typeof fadedark === 'undefined') ? true : fadedark; + fadedark = fadedark || true; $(document).on('keydown.phpbb.alert', function(e) { if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) { @@ -177,14 +177,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; + var confirmed = this.name === 'confirm'; if (confirmed) { callback(true); } $confirmDiv.find('input[type="button"]').off('click.phpbb.confirmbox'); - phpbb.alert.close($confirmDiv, fadedark); + phpbb.alert.close($confirmDiv, fadedark || !confirmed); e.preventDefault(); e.stopPropagation(); |