diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-07-01 14:30:09 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-07-01 14:30:09 +0200 |
| commit | 446dbedbf606c61f06846d04f75e03dfbc3fedfd (patch) | |
| tree | 96d2a24f3b34818bdf97d734125a1c55936e994d /program | |
| parent | ed52a355b3cb16c0ffa30e4181386277abf76195 (diff) | |
Fix so setting frame to blank page works also while frame is loading another page
Diffstat (limited to 'program')
| -rw-r--r-- | program/js/app.js | 10 | ||||
| -rw-r--r-- | program/steps/addressbook/move.inc | 2 |
2 files changed, 7 insertions, 5 deletions
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); }; diff --git a/program/steps/addressbook/move.inc b/program/steps/addressbook/move.inc index 33dd6ea4c..f8204e9ee 100644 --- 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 { |