From 7cc1d3ae170b63c5f477db4eda09b94ab42d1bb5 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 11 Jan 2013 09:13:20 -0500
Subject: [PATCH] Fix opener check in extwin (avoid JS errors in IE when opener is gone); always close extwin, even if opener isn't available anymore
---
program/js/app.js | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index c627983..c1ea2be 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3037,7 +3037,7 @@
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 @@
{
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 {
--
Gitblit v1.9.1