diff options
| author | Callum Macrae <callum@lynxphp.com> | 2012-02-19 16:35:21 +0000 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:10:16 +0200 |
| commit | 64df9d1406a82739d5b85605e29d9d7f3bd3453d (patch) | |
| tree | 67e5addf96e589b257ca8ff1f974cdd2c93e93ff /phpBB | |
| parent | ba56e34b6de6e57edb2b0db66ff3ca4e2081a7ea (diff) | |
| download | forums-64df9d1406a82739d5b85605e29d9d7f3bd3453d.tar forums-64df9d1406a82739d5b85605e29d9d7f3bd3453d.tar.gz forums-64df9d1406a82739d5b85605e29d9d7f3bd3453d.tar.bz2 forums-64df9d1406a82739d5b85605e29d9d7f3bd3453d.tar.xz forums-64df9d1406a82739d5b85605e29d9d7f3bd3453d.zip | |
[ticket/10272] Removed code that was prevent event propogation in AJAX.
PHPBB3-10272
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index bed25b5beb..c41edfa145 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -248,8 +248,8 @@ phpbb.ajaxify = function(options) { is_form = elements.is('form'), event_name = is_form ? 'submit' : 'click'; - elements.bind(event_name, function() { - var action, method, data, that = this, $this = $(this); + elements.bind(event_name, function(event) { + var action, method, data, submit, that = this, $this = $(this); if ($this.find('input[type="submit"][data-clicked]').attr('data-ajax') === 'false') { @@ -361,7 +361,7 @@ phpbb.ajaxify = function(options) { if ($this.find('input[type="submit"][data-clicked]')) { - var submit = $this.find('input[type="submit"][data-clicked]'); + submit = $this.find('input[type="submit"][data-clicked]'); data.push({ name: submit.attr('name'), value: submit.val() @@ -379,7 +379,7 @@ phpbb.ajaxify = function(options) { // and return true (meaning that the HTTP request will be sent normally). if (run_filter && !options.filter.call(this, data)) { - return true; + return; } phpbb.loading_alert(); @@ -392,7 +392,7 @@ phpbb.ajaxify = function(options) { error: error_handler }); - return false; + event.preventDefault(); }); if (is_form) { |