Fix so setting frame to blank page works also while frame is loading …

…another page
roundcube · Jul 1, 2013 · 446dbed · 446dbed
1 parent ed52a35
commit 446dbed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/program/js/app.js b/program/js/app.js
@@ -2014,14 +2014,18 @@ function rcube_webmail()
 
     if (name && (frame = this.get_frame_element(name))) {
       if (!show && (win = this.get_frame_window(name))) {
-        if (win.location && win.location.href.indexOf(this.env.blankpage)<0)
-          win.location.href = this.env.blankpage;
+        if (win.stop)
+          win.stop();
+        else // IE
+          win.document.execCommand('Stop');
+
+        win.location.href = this.env.blankpage;
       }
       else if (!bw.safari && !bw.konq)
         $(frame)[show ? 'show' : 'hide']();
     }
 
-    if (!show && this.busy)
+    if (!show && this.env.frame_lock)
       this.set_busy(false, null, this.env.frame_lock);
   };
 

diff --git a/program/steps/addressbook/move.inc b/program/steps/addressbook/move.inc
@@ -146,8 +146,6 @@ if (!$deleted || $deleted != $all) {
     if ($deleted) {
         rcmail_search_update();
     }
-
-    $OUTPUT->command('list_contacts_clear');
     $OUTPUT->command('list_contacts');
 }
 else {