aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/assets')
-rw-r--r--phpBB/assets/javascript/core.js20
1 files changed, 19 insertions, 1 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index eb9798331e..bed25b5beb 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -251,7 +251,7 @@ phpbb.ajaxify = function(options) {
elements.bind(event_name, function() {
var action, method, data, that = this, $this = $(this);
- if (!$this.attr('data-ajax'))
+ if ($this.find('input[type="submit"][data-clicked]').attr('data-ajax') === 'false')
{
return;
}
@@ -358,6 +358,15 @@ phpbb.ajaxify = function(options) {
action = $this.attr('action').replace('&', '&');
data = $this.serializeArray();
method = $this.attr('method') || 'GET';
+
+ if ($this.find('input[type="submit"][data-clicked]'))
+ {
+ var submit = $this.find('input[type="submit"][data-clicked]');
+ data.push({
+ name: submit.attr('name'),
+ value: submit.val()
+ });
+ }
}
else
{
@@ -386,6 +395,15 @@ phpbb.ajaxify = function(options) {
return false;
});
+ if (is_form) {
+ elements.find('input:submit').click(function () {
+ var $this = $(this);
+
+ $this.siblings('[data-clicked]').removeAttr('data-clicked');
+ $this.attr('data-clicked', 'true');
+ });
+ }
+
return this;
}