diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-02-11 20:32:44 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:09:25 +0200 |
| commit | b8a6a50f5c6a1f1f2ebcf9650e3f026561e2b060 (patch) | |
| tree | ef4cf56b0e8eca7b83d003e0bfe016807048491f | |
| parent | 6ad4015a37c6bba8e3b2a8cddc816f1ba7780dfa (diff) | |
| download | forums-b8a6a50f5c6a1f1f2ebcf9650e3f026561e2b060.tar forums-b8a6a50f5c6a1f1f2ebcf9650e3f026561e2b060.tar.gz forums-b8a6a50f5c6a1f1f2ebcf9650e3f026561e2b060.tar.bz2 forums-b8a6a50f5c6a1f1f2ebcf9650e3f026561e2b060.tar.xz forums-b8a6a50f5c6a1f1f2ebcf9650e3f026561e2b060.zip | |
[feature/ajax] Rename exception to filter
PHPBB3-10270
| -rw-r--r-- | phpBB/assets/javascript/core.js | 10 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ajax.js | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 0ff7436ca5..2f1a19c682 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -336,7 +336,7 @@ phpbb.ajaxify = function(options) { // If the element is a form, POST must be used and some extra data must // be taken from the form. - var run_exception = (typeof options.exception === 'function'); + var run_filter = (typeof options.filter === 'function'); if (is_form) { action = /action\[([a-z]+)\]/.exec(this.name); @@ -353,9 +353,9 @@ phpbb.ajaxify = function(options) { data += '&' + this.name + '=' + this.value; } - // If exception function returns true, cancel the AJAX functionality, + // If filter function returns true, cancel the AJAX functionality, // and return true (meaning that the HTTP request will be sent normally). - if (run_exception && options.exception.call($this.parents('form')[0], action, data)) + if (run_filter && options.filter.call($this.parents('form')[0], action, data)) { return true; } @@ -364,9 +364,9 @@ phpbb.ajaxify = function(options) { } else { - // If exception function returns true, cancel the AJAX functionality, + // If filter function returns true, cancel the AJAX functionality, // and return true (meaning that the HTTP request will be sent normally). - if (run_exception && options.exception.call(this)) + if (run_filter && options.filter.call(this)) { return true; } diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 35e8d6c0b4..f49b0af9c6 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -68,12 +68,12 @@ $('[data-ajax]').each(function() { /** * This AJAXifies the quick-mod tools. The reason it cannot be a standard - * callback / data attribute is that it requires exceptions - some of the options + * callback / data attribute is that it requires filtering - some of the options * can be ajaxified, while others cannot. */ phpbb.ajaxify({ selector: '#quickmodform', - exception: function(act, data) { + filter: function(act, data) { var action = $('#quick-mod-select').val(); if (action === 'make_normal') |