[Svn] r3903 - trunk/roundcubemail/program/js

trac at roundcube.net trac at roundcube.net
Tue Aug 24 10:30:41 CEST 2010


Author: alec
Date: 2010-08-24 03:30:40 -0500 (Tue, 24 Aug 2010)
New Revision: 3903

Modified:
   trunk/roundcubemail/program/js/app.js
Log:
- Fix set_busy() when called from an iframe


Modified: trunk/roundcubemail/program/js/app.js
===================================================================
--- trunk/roundcubemail/program/js/app.js	2010-08-23 10:57:36 UTC (rev 3902)
+++ trunk/roundcubemail/program/js/app.js	2010-08-24 08:30:40 UTC (rev 3903)
@@ -1018,11 +1018,13 @@
       if (msg == message)
         msg = 'Loading...';
 
-      if (this.gui_objects.message && this.gui_objects.message.__type != 'error')
+      // @TODO: show many messages at a time (one below the other ?)
+      if (this.message_type() != 'error')
         this.display_message(msg, 'loading', true);
     }
-    else if (!a && this.gui_objects.message && this.gui_objects.message.__type != 'error')
+    else if (!a && this.message_type() != 'error') {
       this.hide_message();
+    }
 
     this.busy = a;
     //document.body.style.cursor = a ? 'wait' : 'default';
@@ -4511,6 +4513,15 @@
       $(this.gui_objects.message).unbind()[(fade?'fadeOut':'hide')]();
   };
 
+  // get type of currently displayed message
+  this.message_type = function()
+  {
+      if (this.gui_objects.message)
+        return this.gui_objects.message.__type;
+      else if (this.env.framed && parent.rcmail && parent.rcmail.gui_objects.message)
+        return parent.rcmail.gui_objects.message.__type;
+  };
+
   // mark a mailbox as selected and set environment variable
   this.select_folder = function(name, old, prefix)
   {

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list