diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-02-15 19:38:55 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:09:26 +0200 |
| commit | 2f25173d931d00b31087913b1772b51f12623690 (patch) | |
| tree | 3b215d15fdbc63d0160ad2c7c2dd528519d27426 | |
| parent | de82608e6ffa5e2bc12654197b7d7bd580563ddc (diff) | |
| download | forums-2f25173d931d00b31087913b1772b51f12623690.tar forums-2f25173d931d00b31087913b1772b51f12623690.tar.gz forums-2f25173d931d00b31087913b1772b51f12623690.tar.bz2 forums-2f25173d931d00b31087913b1772b51f12623690.tar.xz forums-2f25173d931d00b31087913b1772b51f12623690.zip | |
[feature/ajax] Change filter semantics, some minor adjustments
PHPBB3-10270
| -rw-r--r-- | phpBB/assets/javascript/core.js | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ajax.js | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index b42870f466..488b095b47 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -338,7 +338,7 @@ phpbb.ajaxify = function(options) { { action = $this.attr('action').replace('&', '&'); data = $this.serializeArray(); - method = $this.attr('method'); + method = $this.attr('method') || 'GET'; } else { @@ -347,7 +347,7 @@ phpbb.ajaxify = function(options) { method = 'GET'; } - // If filter function returns true, cancel the AJAX functionality, + // If filter function returns false, cancel the AJAX functionality, // and return true (meaning that the HTTP request will be sent normally). if (run_filter && options.filter.call(this, data)) { diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 4360dc645f..f82da9f70e 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -73,25 +73,25 @@ $('[data-ajax]').each(function() { */ phpbb.ajaxify({ selector: '#quickmodform', - filter: function(data) { + refresh: true, + filter: function (data) { var action = $('#quick-mod-select').val(); if (action === 'make_normal') { - return !($(this).find('select option[value="make_global"]').length); + return $(this).find('select option[value="make_global"]').length > 0; } else if (action === 'lock' || action === 'unlock') { - return false; + return true; } if (action === 'delete_topic' || action === 'make_sticky' || action === 'make_announce' || action === 'make_global') { - return false; + return true; } - return true; - }, - refresh: true + return false; + } }); |