Fix opener check in extwin (avoid JS errors in IE when opener is gone); always close extwin, even if opener isn't available anymore

pull/88/head
Thomas Bruederli 12 years ago
parent 9d318f5347
commit 7cc1d3ae17

@ -3037,7 +3037,7 @@ function rcube_webmail()
ac_props;
// close compose step in opener
if (window.opener && opener.rcmail && opener.rcmail.env.action == 'compose') {
if (window.opener && !window.opener.closed && opener.rcmail && opener.rcmail.env.action == 'compose') {
setTimeout(function(){ opener.history.back(); }, 100);
this.env.opened_extwin = true;
}
@ -3707,9 +3707,10 @@ function rcube_webmail()
{
this.display_message(msg, type);
if (this.env.extwin && window.opener && opener.rcmail) {
if (this.env.extwin) {
this.lock_form(this.gui_objects.messageform);
opener.rcmail.display_message(msg, type);
if (window.opener && !window.opener.closed && opener.rcmail)
opener.rcmail.display_message(msg, type);
setTimeout(function(){ window.close() }, 1000);
}
else {

Loading…
Cancel
Save