makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/ajax] Rename exception to filter

Browse source 
PHPBB3-10270
This commit is contained in:
Igor Wiedler 2012-02-11 20:32:44 +01:00
parent 6ad4015a37
commit b8a6a50f5c
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/assets/javascript/core.js
View file

@ -336,7 +336,7 @@ phpbb.ajaxify = function(options) {
// If the element is a form, POST must be used and some extra data must // If the element is a form, POST must be used and some extra data must
// be taken from the form. // be taken from the form.
var run_exception = (typeof options.exception === 'function'); var run_filter = (typeof options.filter === 'function');
if (is_form) if (is_form)
{ {
action = /action\[([a-z]+)\]/.exec(this.name); action = /action\[([a-z]+)\]/.exec(this.name);
@ -353,9 +353,9 @@ phpbb.ajaxify = function(options) {
data += '&' + this.name + '=' + this.value; 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). // 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; return true;
} }
@ -364,9 +364,9 @@ phpbb.ajaxify = function(options) {
} }
else 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). // 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; return true;
} }

4
phpBB/styles/prosilver/template/ajax.js
View file

@ -68,12 +68,12 @@ $('[data-ajax]').each(function() {
/** /**
* This AJAXifies the quick-mod tools. The reason it cannot be a standard * 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. * can be ajaxified, while others cannot.
*/ */
phpbb.ajaxify({ phpbb.ajaxify({
selector: '#quickmodform', selector: '#quickmodform',
exception: function(act, data) { filter: function(act, data) {
var action = $('#quick-mod-select').val(); var action = $('#quick-mod-select').val();
if (action === 'make_normal') if (action === 'make_normal')