From 7c3c6e8d70ee3c45305700eb90f020a16b1dcdd1 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 8 Nov 2016 15:48:25 +0100 Subject: [PATCH] =?utf8?q?ClientJS:=20Update=20nach=20=C2=BBAutomatisches?= =?utf8?q?=20L=C3=B6schen=20von=20Flashanzeige=20unterdr=C3=BCckbar=C2=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- js/client_js.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/js/client_js.js b/js/client_js.js index d29fca627..c1331a275 100644 --- a/js/client_js.js +++ b/js/client_js.js @@ -35,7 +35,6 @@ ns.eval_json_result = function(data) { if (data.error) return ns.display_flash('error', data.error); - if (!data.no_flash_clear) { $(['info', 'warning', 'error']).each(function(idx, category) { $('#flash_' + category).hide(); $('#flash_detail_' + category).hide(); @@ -43,7 +42,7 @@ ns.eval_json_result = function(data) { $('#flash_' + category + '_content').empty(); $('#flash_' + category + '_detail').empty(); }); - } + if ((data.js || '') != '') eval(data.js); @@ -151,7 +150,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] == 'clear_flash') kivi.display_flash_detail(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]); -- 2.20.1