Tweak isWindow check

krakenjs · Oct 12, 2016 · faebcc6 · faebcc6
1 parent a50e6bf
commit faebcc6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/lib/windows.js b/src/lib/windows.js
@@ -15,14 +15,14 @@ export function isSameDomain(win) {
         }
     }
 
-    let match = false;
+    let match;
 
     try {
         if (util.getDomain(window) === util.getDomain(win)) {
             match = true;
         }
     } catch (err) {
-        // pass
+        match = false;
     }
 
     global.domainMatches.push({
@@ -46,7 +46,7 @@ export function isWindow(item) {
         return false;
     }
 
-    if (isSameDomain(item)) {
+    if (isSameDomain(item) !== false) {
         try {
 
             for (let key of [ 'setTimeout', 'setInterval', 'postMessage', 'alert' ]) {
@@ -320,7 +320,7 @@ export function getFrameByName(win, name) {
 
     for (let childFrame of getFrames(win)) {
         try {
-            if (childFrame.name === name && isWindow(childFrame)) {
+            if (isSameDomain(childFrame) && childFrame.name === name && isWindow(childFrame)) {
                 return childFrame;
             }
         } catch (err) {