From dbdd71f166bc0fe89db614d3a6738aadc49ed0df Mon Sep 17 00:00:00 2001 From: thomascube Date: Sat, 31 Jul 2010 10:22:32 +0000 Subject: Don't replace error messages with loading info (#1486300) --- program/js/app.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'program/js') diff --git a/program/js/app.js b/program/js/app.js index c4ddb21e2..2f7b55b6e 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1018,9 +1018,10 @@ function rcube_webmail() if (msg == message) msg = 'Loading...'; - this.display_message(msg, 'loading', true); + if (this.gui_objects.message && this.gui_objects.message.__type != 'error') + this.display_message(msg, 'loading', true); } - else if (!a) + else if (!a && this.gui_objects.message && this.gui_objects.message.__type != 'error') this.hide_message(); this.busy = a; @@ -4489,6 +4490,7 @@ function rcube_webmail() cont = '
'+cont+'
'; var obj = $(this.gui_objects.message).html(cont).show(); + this.gui_objects.message.__type = type; if (type!='loading') obj.bind('mousedown', function(){ ref.hide_message(); return true; }); -- cgit v1.2.3