Merge pull request #783 from goldfiglabs/fix_ff_content_script

Fixes #522 by binding `requestAnimationFrame` to `window`
davidjbradshaw · Dec 30, 2019 · 92fc77f · 92fc77f
2 parents ca89bb2 + 33f6677
commit 92fc77f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/js/iframeResizer.contentWindow.min.js b/js/iframeResizer.contentWindow.min.js
diff --git a/js/iframeResizer.js b/js/iframeResizer.js
@@ -94,6 +94,11 @@
 
     if (!requestAnimationFrame) {
       log('setup', 'RequestAnimationFrame not supported')
+    } else {
+      // Firefox extension content-scripts have a globalThis object that is not the same as window.
+      // Binding `requestAnimationFrame` to window allows the function to work and prevents errors
+      // being thrown when run in that context, and should be a no-op in every other context.
+      requestAnimationFrame = requestAnimationFrame.bind(window);
     }
   }
 
@@ -175,7 +180,7 @@
       var bot = compStyle.paddingBottom ? parseInt(compStyle.paddingBottom, 10) : 0
       return top + bot
     }
-    
+
     function getBorderEnds(compStyle) {
       if (compStyle.boxSizing !== 'border-box') {
         return 0;

diff --git a/js/iframeResizer.map b/js/iframeResizer.map
diff --git a/js/iframeResizer.min.js b/js/iframeResizer.min.js
diff --git a/src/iframeResizer.js b/src/iframeResizer.js
@@ -94,6 +94,11 @@
 
     if (!requestAnimationFrame) {
       log('setup', 'RequestAnimationFrame not supported')
+    } else {
+      // Firefox extension content-scripts have a globalThis object that is not the same as window.
+      // Binding `requestAnimationFrame` to window allows the function to work and prevents errors
+      // being thrown when run in that context, and should be a no-op in every other context.
+      requestAnimationFrame = requestAnimationFrame.bind(window);
     }
   }
 
@@ -175,7 +180,7 @@
       var bot = compStyle.paddingBottom ? parseInt(compStyle.paddingBottom, 10) : 0
       return top + bot
     }
-    
+
     function getBorderEnds(compStyle) {
       if (compStyle.boxSizing !== 'border-box') {
         return 0;