From 446dbedbf606c61f06846d04f75e03dfbc3fedfd Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 01 Jul 2013 08:30:09 -0400
Subject: [PATCH] Fix so setting frame to blank page works also while frame is loading another page
---
program/steps/addressbook/move.inc | 2 --
program/js/app.js | 10 +++++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 917fd8a..03476b6 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2014,14 +2014,18 @@
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
index 33dd6ea..f8204e9 100644
--- a/program/steps/addressbook/move.inc
+++ b/program/steps/addressbook/move.inc
@@ -146,8 +146,6 @@
if ($deleted) {
rcmail_search_update();
}
-
- $OUTPUT->command('list_contacts_clear');
$OUTPUT->command('list_contacts');
}
else {
--
Gitblit v1.9.1