X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=scripts%2Fgenerate_client_js_actions.tpl;h=274076a7a8a02a1253afcfc782d01c0082188968;hb=e286e6ca8a50f39829a4a83ab30b951ba2fd1329;hp=9e2180289895405366ebe851edf7f91ba71471da;hpb=c00f1e29f10d6b371dffc401f6e2c5d11eeb16c5;p=kivitendo-erp.git diff --git a/scripts/generate_client_js_actions.tpl b/scripts/generate_client_js_actions.tpl index 9e2180289..274076a7a 100644 --- a/scripts/generate_client_js_actions.tpl +++ b/scripts/generate_client_js_actions.tpl @@ -5,9 +5,27 @@ // 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(); + if (!noscroll) { + $('#frame-header')[0].scrollIntoView(); + } +}; + +ns.display_flash_detail = function(type, message) { + $('#flash_' + type + '_detail').html(message); + $('#flash_' + type + '_disp').show(); +}; + +ns.clear_flash = function(category , timeout) { + window.setTimeout(function(){ + $('#flash_' + category).hide(); + $('#flash_detail_' + category).hide(); + $('#flash_' + category + '_disp').hide(); + $('#flash_' + category + '_content').empty(); + $('#flash_' + category + '_detail').empty(); + }, timeout); }; ns.eval_json_result = function(data) { @@ -17,11 +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_' + category + '_content').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);