Changeset 4302 in subversion

Timestamp:

Dec 2, 2010 4:05:56 AM (2 years ago)

Author:

alec

Message:

• Fix preview window doesn't work when RC is in a frame (#1487314)
• Add helper function is_framed()

File:

• trunk/roundcubemail/program/js/app.js (modified) (8 diffs)

trunk/roundcubemail/program/js/app.js

@@ -149 +149 @@
 
     // tell parent window that this frame is loaded
-    if (this.env.framed && parent.rcmail && parent.rcmail.set_busy) {
+    if (this.is_framed()) {
       parent.rcmail.set_busy(false, null, parent.rcmail.env.frame_lock);
       parent.rcmail.env.frame_lock = null;
@@ -223 +223 @@
 
           // make preview/message frame visible
-          if (this.env.action == 'preview' && this.env.framed && parent.rcmail) {
+          if (this.env.action == 'preview' && this.is_framed()) {
             this.enable_command('compose', 'add-contact', false);
             parent.rcmail.show_contentframe(true);
@@ -436 +436 @@
     if (!this.commands[command]) {
       // pass command to parent window
-      if (this.env.framed && parent.rcmail && parent.rcmail.command)
+      if (this.is_framed())
         parent.rcmail.command(command, props);
 
@@ -1121 +1121 @@
   this.reload = function(delay)
   {
-    if (this.env.framed && parent.rcmail)
+    if (this.is_framed())
       parent.rcmail.reload(delay);
     else if (delay)
@@ -1149 +1149 @@
       return url + '?' + name + '=' + value;
   };
+
+  this.is_framed = function()
+  {
+    return (this.env.framed && parent.rcmail);
+  };
+
 
   /*********************************************************/
@@ -1824 +1830 @@
     else {
       if (!this.env.frame_lock) {
-        (parent.rcmail ? parent.rcmail : this).env.frame_lock = this.set_busy(true, 'loading');
+        (this.is_framed() ? parent.rcmail : this).env.frame_lock = this.set_busy(true, 'loading');
       }
       target.location.href = this.env.comm_path+url;
@@ -4600 +4606 @@
   {
     // pass command to parent window
-    if (this.env.framed && parent.rcmail)
+    if (this.is_framed())
       return parent.rcmail.display_message(msg, type);
 
@@ -4648 +4654 @@
   {
     // pass command to parent window
-    if (this.env.framed && parent.rcmail)
+    if (this.is_framed())
       return parent.rcmail.hide_message(obj, fade);