Allow finding frames anywhere in hierarchy

Author: Daniel Brain

src/drivers/listeners.js

@@ -13,6 +13,23 @@ export function resetListeners() {
     global.listeners.response = [];
 }
 
+function matchDomain(domain, origin) {
+
+    if (typeof domain === 'string') {
+        return domain === '*' || origin === domain;
+    }
+
+    if (Object.prototype.toString.call(domain) === '[object RegExp]') {
+        return origin.match(domain);
+    }
+
+    if (Array.isArray(domain)) {
+        return domain.indexOf(origin) !== -1;
+    }
+
+    return false;
+}
+
 export function getRequestListener(name, win, domain) {
 
     let result = {};
@@ -27,7 +44,7 @@ export function getRequestListener(name, win, domain) {
         let specifiedDomain = (requestListener.domain && requestListener.domain !== '*');
 
         let matchedWin = (specifiedWin && requestListener.win === win);
-        let matchedDomain = (specifiedDomain && requestListener.domain === domain);
+        let matchedDomain = (specifiedDomain && matchDomain(requestListener.domain, domain));
 
         if (specifiedWin && specifiedDomain) {
             if (matchedWin && matchedDomain) {

src/lib/windows.js

@@ -306,6 +306,33 @@ export function getFrameByName(win, name) {
     }
 }
 
+export function findFrameByName(win, name) {
+
+    let frame;
+
+    frame = getFrameByName(win, name);
+
+    if (frame) {
+        return frame;
+    }
+
+    for (let ancestor of getAncestors(win)) {
+        frame = getFrameByName(ancestor, name);
+
+        if (frame) {
+            return frame;
+        }
+    }
+
+    for (let childFrame of getFrames(win)) {
+        frame = getFrameByName(childFrame, name);
+
+        if (frame) {
+            return frame;
+        }
+    }
+}
+
 export function isParent(win, frame) {
 
     let frameParent = getParent(frame);
@@ -344,6 +371,22 @@ export function getAncestor(win) {
     }
 }
 
+export function getAncestors(win) {
+
+    let results = [];
+
+    let ancestor = win;
+
+    while (ancestor) {
+        ancestor = getAncestor(ancestor);
+        if (ancestor) {
+            results.push(ancestor);
+        }
+    }
+
+    return results;
+}
+
 
 export function isAncestor(parent, child) {