diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-02-08 18:58:23 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:09:23 +0200 |
| commit | b100bb9a69982221e7244ac74dd1de421b6344bc (patch) | |
| tree | edf1a7703f68e54dc26fb2f2b6a80928d64ba9d7 | |
| parent | 30888ff2a009fe5a001046484d5df4b6e2c67ac8 (diff) | |
| download | forums-b100bb9a69982221e7244ac74dd1de421b6344bc.tar forums-b100bb9a69982221e7244ac74dd1de421b6344bc.tar.gz forums-b100bb9a69982221e7244ac74dd1de421b6344bc.tar.bz2 forums-b100bb9a69982221e7244ac74dd1de421b6344bc.tar.xz forums-b100bb9a69982221e7244ac74dd1de421b6344bc.zip | |
[feature/ajax] Replace return false with explicit preventDefault()
PHPBB3-10270
| -rw-r--r-- | phpBB/assets/javascript/core.js | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 4e0ed11a8e..68f7cf4ed8 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -59,7 +59,6 @@ phpbb.alert = function(title, msg, fadedark) { div.bind('click', function(e) { e.stopPropagation(); - return true; }); dark.one('click', function(e) { div.find('.alert_close').unbind('click'); @@ -67,15 +66,18 @@ phpbb.alert = function(title, msg, fadedark) { fade.fadeOut(phpbb.alert_time, function() { div.hide(); }); - return false; + + e.preventDefault(); + e.stopPropagation(); }); $(document).bind('keydown', function(e) { if (e.keyCode === keymap.ENTER || e.keyCode === keymap.ESC) { dark.trigger('click'); - return false; + + e.preventDefault(); + e.stopPropagation(); } - return true; }); div.find('.alert_close').one('click', function() { @@ -123,10 +125,9 @@ phpbb.confirm = function(msg, callback, fadedark) { div.bind('click', function(e) { e.stopPropagation(); - return true; }); - var click_handler = function() { + var click_handler = function(e) { var res = this.className === 'button1'; var fade = (typeof fadedark !== 'undefined' && !fadedark && res) ? div : dark; fade.fadeOut(phpbb.alert_time, function() { @@ -134,7 +135,11 @@ phpbb.confirm = function(msg, callback, fadedark) { }); div.find('input[type="button"]').unbind('click', click_handler); callback(res); - return false; + + if (e) { + e.preventDefault(); + e.stopPropagation(); + } }; div.find('input[type="button"]').one('click', click_handler); @@ -144,18 +149,21 @@ phpbb.confirm = function(msg, callback, fadedark) { div.hide(); }); callback(false); - return false; + + e.preventDefault(); + e.stopPropagation(); }); $(document).bind('keydown', function(e) { if (e.keyCode === keymap.ENTER) { $('input[type="button"].button1').trigger('click'); - return false; + e.preventDefault(); + e.stopPropagation(); } else if (e.keyCode === keymap.ESC) { $('input[type="button"].button2').trigger('click'); - return false; + e.preventDefault(); + e.stopPropagation(); } - return true; }); div.find('.alert_close').one('click', function() { @@ -238,7 +246,7 @@ phpbb.ajaxify = function(options, refresh, callback) { if ($this.attr('data-ajax') == false) { - return true; + return; } /** |