fix tests. refactor findIFrame util

Author: jdreetz

src/lib/embed.js

@@ -3,7 +3,7 @@
  */
 
 import Player from '../player';
-import { isVimeoUrl, getVimeoUrl, getOembedDomain, isVimeoEmbed, getIFrameFromMessageEvent } from './functions';
+import { isVimeoUrl, getVimeoUrl, getOembedDomain, isVimeoEmbed, findIframeBySourceWindow } from './functions';
 import { parseMessageData } from './postmessage';
 
 const oEmbedParameters = [
@@ -224,7 +224,7 @@ export function resizeEmbeds(parent = document) {
             return;
         }
 
-        const senderIFrame = getIFrameFromMessageEvent(event, parent);
+        const senderIFrame = event.source ? findIframeBySourceWindow(event.source, parent) : null;
 
         if (senderIFrame) {
             // Change padding-bottom of the enclosing div to accommodate
@@ -260,7 +260,7 @@ export function initAppendVideoMetadata(parent = document) {
             return;
         }
 
-        const senderIFrame = getIFrameFromMessageEvent(event, parent);
+        const senderIFrame = event.source ? findIframeBySourceWindow(event.source, parent) : null;
 
         // Initiate appendVideoMetadata if iframe is a Vimeo embed
         if (senderIFrame && isVimeoEmbed(senderIFrame.src)) {
@@ -301,7 +301,7 @@ export function checkUrlTimeParam(parent = document) {
             return;
         }
 
-        const senderIFrame = getIFrameFromMessageEvent(event, parent);
+        const senderIFrame = event.source ? findIframeBySourceWindow(event.source, parent) : null;
 
         if (senderIFrame && isVimeoEmbed(senderIFrame.src)) {
             const player = new Player(senderIFrame);
@@ -350,7 +350,7 @@ export function updateDRMEmbeds() {
             return;
         }
 
-        const senderIFrame = getIFrameFromMessageEvent(event);
+        const senderIFrame = event.source ? findIframeBySourceWindow(event.source) : null;
 
         if (!senderIFrame) {
             return;

src/lib/functions.js

@@ -87,7 +87,7 @@ export function getOembedDomain(url) {
         }
     }
 
-    return 'vimeo.dev';
+    return 'vimeo.com';
 }
 
 /**
@@ -153,22 +153,21 @@ export const logSurveyLink = () => {
 };
 
 /**
- * Find the iframe element that contains the source window from a message event
+ * Find the iframe element that contains a specific source window
  *
- * @param {MessageEvent} event The message event
+ * @param {Window} sourceWindow The source window to find the iframe for
  * @param {Document} [doc=document] The document to search within
  * @return {HTMLIFrameElement|null} The iframe element if found, otherwise null
  */
-export function getIFrameFromMessageEvent(event, doc = document) {
-    if (!event || !event.source) {
+export function findIframeBySourceWindow(sourceWindow, doc = document) {
+    if (!sourceWindow || !doc || typeof doc.querySelectorAll !== 'function') {
         return null;
     }
 
-    const sourceWindow = event.source;
     const iframes = doc.querySelectorAll('iframe');
 
     for (let i = 0; i < iframes.length; i++) {
-        if (iframes[i].contentWindow === sourceWindow) {
+        if (iframes[i] && iframes[i].contentWindow === sourceWindow) {
             return iframes[i];
         }
     }