diff options
| author | David DeSandro <david@desandro.com> | 2015-12-04 08:07:09 -0500 |
|---|---|---|
| committer | David DeSandro <david@desandro.com> | 2015-12-04 08:07:09 -0500 |
| commit | 59a89be65a0934d78d02853358918e3aa6e47de8 (patch) | |
| tree | 5c3a6eeafa18ecb9386b5e3274fd9abb75b450da | |
| parent | 04adcc78fb6e1c66489b361aeb04347b5c425c27 (diff) | |
| parent | 4d0d9141a529d70be154323fbd676bb9bb3187d2 (diff) | |
| download | imagesloaded-59a89be65a0934d78d02853358918e3aa6e47de8.zip imagesloaded-59a89be65a0934d78d02853358918e3aa6e47de8.tar.gz imagesloaded-59a89be65a0934d78d02853358918e3aa6e47de8.tar.bz2 | |
Merge pull request #214 from adam-h/patch-1
fix for getComputedStyle returning null for hidden iframes in Firefox
| -rw-r--r-- | imagesloaded.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/imagesloaded.js b/imagesloaded.js index f407da0..e89f745 100644 --- a/imagesloaded.js +++ b/imagesloaded.js @@ -179,6 +179,10 @@ function makeArray( obj ) { ImagesLoaded.prototype.addElementBackgroundImages = function( elem ) { var style = getStyle( elem ); + if(!style) { + // Firefox returns null if in a hidden iframe https://bugzilla.mozilla.org/show_bug.cgi?id=548397 + return; + } // get url inside url("...") var reURL = /url\((['"])?(.*?)\1\)/gi; var matches = reURL.exec( style.backgroundImage ); |