summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2010-07-31 10:22:32 +0000
committerthomascube <thomas@roundcube.net>2010-07-31 10:22:32 +0000
commitdbdd71f166bc0fe89db614d3a6738aadc49ed0df (patch)
tree6a88abe0968a8e921e8fb6036ab5bbeb1e8a0edb
parent5cff852b07b83ddf330fcaffd0843eb3cad6d5ee (diff)
Don't replace error messages with loading info (#1486300)
-rw-r--r--program/js/app.js6
1 files changed, 4 insertions, 2 deletions
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 = '<div class="'+type+'">'+cont+'</div>';
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; });