mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-04 17:21:39 +09:00
Make procFilter() use exec_json() instead of exec_xml() internally, and deprecate it
This commit is contained in:
parent
e9e46e3391
commit
c84756e769
1 changed files with 23 additions and 3 deletions
|
|
@ -395,6 +395,12 @@ function filterAlertMessage(ret_obj) {
|
|||
* @deprecated
|
||||
*/
|
||||
function procFilter(form, filter_func) {
|
||||
var msg = "DEPRECATED : procFilter() is deprecated in Rhymix.";
|
||||
if (navigator.userAgent.match(/Firefox/)) {
|
||||
console.error(msg);
|
||||
} else {
|
||||
console.warn(msg);
|
||||
}
|
||||
filter_func(form);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -415,9 +421,12 @@ function legacy_filter(filter_name, form, module, act, callback, responses, conf
|
|||
if(!v || !n) return true;
|
||||
if(rename_params[n]) n = rename_params[n];
|
||||
|
||||
if(/\[\]$/.test(n)) n = n.replace(/\[\]$/, '');
|
||||
n = n.replace(/\[\]$/, '');
|
||||
if(params[n]) {
|
||||
params[n] += '|@|'+v;
|
||||
if (!Array.isArray(params[n])) {
|
||||
params[n] = [params[n]];
|
||||
}
|
||||
params[n].push(v);
|
||||
} else {
|
||||
params[n] = field.value;
|
||||
}
|
||||
|
|
@ -425,7 +434,18 @@ function legacy_filter(filter_name, form, module, act, callback, responses, conf
|
|||
|
||||
if (confirm_msg && !confirm(confirm_msg)) return false;
|
||||
|
||||
exec_xml(module, act, params, callback, responses, params, form);
|
||||
//exec_xml(module, act, params, callback, responses, params, form);
|
||||
exec_json(module + '.' + act, params, function(result) {
|
||||
if ($.isFunction(callback)) {
|
||||
var filtered_result = {};
|
||||
responses.forEach(function(key) {
|
||||
if (result[key]) {
|
||||
filtered_result[key] = result[key];
|
||||
}
|
||||
});
|
||||
callback(filtered_result, responses, params, form);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
v.cast('ADD_CALLBACK', args);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue