- On login screen show only one message at a time

1 files changed, 18 insertions, 0 deletions

diff --git a/program/js/app.js b/program/js/app.js
index bd8669b0d..d406844ae 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -431,6 +431,7 @@ function rcube_webmail()
         // display 'loading' message on form submit, lock submit button
         $('form').submit(function () {
           $('input[type=submit]', this).prop('disabled', true);
+          rcmail.clear_messages();
           rcmail.display_message('', 'loading');
         });
 
@@ -5544,6 +5545,23 @@ function rcube_webmail()
     }
   };
 
+  // remove all messages immediately
+  this.clear_messages = function()
+  {
+    // pass command to parent window
+    if (this.is_framed())
+      return parent.rcmail.clear_messages();
+
+    var k, n, m = this.messages;
+
+    for (k in m)
+      for (n in m[k].elements)
+        if (m[k].obj)
+          m[k].obj.hide();
+
+    this.messages = {};
+  };
+
   // mark a mailbox as selected and set environment variable
   this.select_folder = function(name, prefix, encode)
   {