From 446dbedbf606c61f06846d04f75e03dfbc3fedfd Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 1 Jul 2013 14:30:09 +0200 Subject: Fix so setting frame to blank page works also while frame is loading another page --- program/js/app.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'program/js') diff --git a/program/js/app.js b/program/js/app.js index 917fd8a78..03476b63d 100644 --- 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); }; -- cgit v1.2.3