Merge pull request #550 from rstudio/bugfix/offscreen-shinyapps

Deal gracefully with elements that have no computed style available
rstudio · Jul 23, 2014 · 36aefad · 36aefad
2 parents 3db47c0 + 75ccfe3
commit 36aefad
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/inst/www/shared/shiny.js b/inst/www/shared/shiny.js
@@ -34,9 +34,14 @@
     var x;
     if (el.currentStyle)
       x = el.currentStyle[styleProp];
-    else if (window.getComputedStyle)
-      x = document.defaultView.getComputedStyle(el, null)
-          .getPropertyValue(styleProp);
+    else if (window.getComputedStyle) {
+      // getComputedStyle can return null when we're inside a hidden iframe on
+      // Firefox; don't attempt to retrieve style props in this case.
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=548397 
+      var style = document.defaultView.getComputedStyle(el, null);
+      if (style)
+        x = style.getPropertyValue(styleProp);
+    }
     return x;
   }