X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fclient_js.js;h=e5fdcb5788686fd31b0ca18f0f8023201c1e667e;hb=824f9ddf5ac3c5d8f46fa8a3bcd49456aa9f0e22;hp=0477715a81f895664de10de6e8fd5c5df113b5ef;hpb=17f39e02a0d2b7ceb565258861217fa7ba6bfbcf;p=kivitendo-erp.git diff --git a/js/client_js.js b/js/client_js.js index 0477715a8..e5fdcb578 100644 --- a/js/client_js.js +++ b/js/client_js.js @@ -86,6 +86,11 @@ ns.eval_json_result = function(data) { // Form Events else if (action[0] == 'focus') $(action[1]).focus(); + // Generic Event Handling ## + else if (action[0] == 'on') $(action[1]).on(action[2], kivi.get_function_by_name(action[3])); + else if (action[0] == 'off') $(action[1]).off(action[2], kivi.get_function_by_name(action[3])); + else if (action[0] == 'one') $(action[1]).one(action[2], kivi.get_function_by_name(action[3])); + // ## jqModal plugin ## // Closing and removing the popup @@ -119,6 +124,7 @@ ns.eval_json_result = function(data) { // ## other stuff ## else if (action[0] == 'redirect_to') window.location.href = action[1]; + else if (action[0] == 'reinit_widgets') kivi.reinit_widgets(); else console.log('Unknown action: ' + action[0]); @@ -128,8 +134,15 @@ ns.eval_json_result = function(data) { }; ns.submit_ajax_form = function(url, form_selector, additional_data) { - var separator = /\?/.test(url) ? '&' : '?'; - $.post(url + separator + $(form_selector).serialize(), additional_data, ns.eval_json_result); + var data = $(form_selector).serialize(); + if (additional_data) { + if (data) + data += '&'; + data += typeof additional_data == "string" ? additional_data : $(additional_data).serialize(); + } + + $.post(url, data, ns.eval_json_result); + return true; };