From 4848d6c9e839c287de736cf3badac42e859eaa69 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Tue, 14 Feb 2012 16:51:26 +0100 Subject: [PATCH] [feature/ajax] Bind to form.submit instead of form input.click PHPBB3-10270 --- phpBB/assets/javascript/core.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 2f1a19c682..4300e7056f 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -245,17 +245,13 @@ phpbb.ajaxify = function(options) { var elements = $(options.selector), refresh = options.refresh, callback = options.callback, - is_form = elements.is('form'); + is_form = elements.is('form'), + event_name = is_form ? 'submit' : 'click'; - if (is_form) - { - elements = elements.find('input:submit'); - } - - elements.click(function() { + elements.bind(event_name, function() { var action, data, path, that = this, $this = $(this); - if ($this.attr('data-ajax') == false) + if (!$this.attr('data-ajax')) { return; } @@ -290,7 +286,7 @@ phpbb.ajaxify = function(options) { if (typeof phpbb.ajax_callbacks[callback] === 'function') { - phpbb.ajax_callbacks[callback].call(that, res, (is_form) ? act : null); + phpbb.ajax_callbacks[callback].call(that, res); } // If the server says to refresh the page, check whether the page should