Firefox: fix tab closing issue (pop-up blocking)

10 years ago · 6250109a78
parent f482164601
commit 6250109a78
1 changed files with 6 additions and 2 deletions
--- a/platform/firefox/frameModule.js
+++ b/platform/firefox/frameModule.js
@ -127,7 +127,9 @@ const contentObserver = {
            context = context.contentWindow || context;

            try {
-                openerURL = context.opener.location.href;
+                if ( context !== context.opener ) {
+                    openerURL = context.opener.location.href;
+                }
            } catch (ex) {}

            let isPopup = location.spec === 'about:blank' && openerURL;
@ -139,7 +141,9 @@ const contentObserver = {
            context = context.contentWindow || context;

            try {
-                openerURL = context.opener.location.href;
+                if ( context !== context.opener ) {
+                    openerURL = context.opener.location.href;
+                }
            } catch (ex) {}
        } else {
            context = (context.ownerDocument || context).defaultView;