X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/kivitendo-erp.git/blobdiff_plain/4b1bcc4753f0a4870b4abb8053a63c548896c5e3..fb63efe1b63573c2ee3535cb2f9e63502dd0e848:/js/client_js.js diff --git a/js/client_js.js b/js/client_js.js index c592e4c8e..8be5676e4 100644 --- a/js/client_js.js +++ b/js/client_js.js @@ -35,16 +35,19 @@ ns.eval_json_result = function(data) { if (data.error) return ns.display_flash('error', data.error); - $(['info', 'warning', 'error']).each(function(idx, category) { - $('#flash_' + category).hide(); - $('#flash_detail_' + category).hide(); - $('#flash_' + category + '_disp').hide(); - $('#flash_' + category + '_content').empty(); - $('#flash_' + category + '_detail').empty(); - }); - - if ((data.js || '') != '') + if (!data.no_flash_clear) { + $(['info', 'warning', 'error']).each(function(idx, category) { + $('#flash_' + category).hide(); + $('#flash_detail_' + category).hide(); + $('#flash_' + category + '_disp').hide(); + $('#flash_' + category + '_content').empty(); + $('#flash_' + category + '_detail').empty(); + }); + } + if ((data.js || '') !== '') + // jshint -W061 eval(data.js); + // jshint +W061 if (data.eval_actions) $(data.eval_actions).each(function(idx, action) { @@ -115,7 +118,7 @@ ns.eval_json_result = function(data) { else if (action[0] == 'dialog:close') $(action[1]).dialog('close'); // ## jQuery Form plugin ## - else if (action[0] == 'ajaxForm') pattern: $(action[1]).ajaxForm({ success: eval_json_result }); + else if (action[0] == 'ajaxForm') $(action[1]).ajaxForm({ success: eval_json_result }); // ## jstree plugin ##