X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/5bc3c720b5c6f422ca3fa63d6d400d3a46fd633d..a143bb853debae00c61b9666e8843cfafda6e3b7:/js/client_js.js diff --git a/js/client_js.js b/js/client_js.js index 6b3784a5a..3f2bde585 100644 --- a/js/client_js.js +++ b/js/client_js.js @@ -5,10 +5,12 @@ // SL/ClientJS.pm for instructions. namespace("kivi", function(ns) { -ns.display_flash = function(type, message) { +ns.display_flash = function(type, message, noscroll) { $('#flash_' + type + '_content').text(message); $('#flash_' + type).show(); - $('#frame-header')[0].scrollIntoView(); + if (!noscroll) { + $('#frame-header')[0].scrollIntoView(); + } }; ns.display_flash_detail = function(type, message) { @@ -33,14 +35,15 @@ 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.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 || '') != '') eval(data.js); @@ -148,6 +151,7 @@ ns.eval_json_result = function(data) { else if (action[0] == 'redirect_to') window.location.href = action[1]; else if (action[0] == 'flash') kivi.display_flash(action[1], action[2]); else if (action[0] == 'flash_detail') kivi.display_flash_detail(action[1], action[2]); + else if (action[0] == 'clear_flash') kivi.clear_flash(action[1], action[2]); else if (action[0] == 'reinit_widgets') kivi.reinit_widgets(); else if (action[0] == 'run') kivi.run(action[1], action.slice(2, action.length)); else if (action[0] == 'run_once_for') kivi.run_once_for(action[1], action[2], action[3]);