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

pull/85/head
Aleksander Machniak 12 years ago
parent ed52a355b3
commit 446dbedbf6

@ -2014,14 +2014,18 @@ function rcube_webmail()
if (name && (frame = this.get_frame_element(name))) { if (name && (frame = this.get_frame_element(name))) {
if (!show && (win = this.get_frame_window(name))) { if (!show && (win = this.get_frame_window(name))) {
if (win.location && win.location.href.indexOf(this.env.blankpage)<0) if (win.stop)
win.stop();
else // IE
win.document.execCommand('Stop');
win.location.href = this.env.blankpage; win.location.href = this.env.blankpage;
} }
else if (!bw.safari && !bw.konq) else if (!bw.safari && !bw.konq)
$(frame)[show ? 'show' : 'hide'](); $(frame)[show ? 'show' : 'hide']();
} }
if (!show && this.busy) if (!show && this.env.frame_lock)
this.set_busy(false, null, this.env.frame_lock); this.set_busy(false, null, this.env.frame_lock);
}; };

@ -146,8 +146,6 @@ if (!$deleted || $deleted != $all) {
if ($deleted) { if ($deleted) {
rcmail_search_update(); rcmail_search_update();
} }
$OUTPUT->command('list_contacts_clear');
$OUTPUT->command('list_contacts'); $OUTPUT->command('list_contacts');
} }
else { else {

Loading…
Cancel
Save