fixed safari responsive image bug

marcj · Jan 31, 2016 · e5d44a7 · e5d44a7
1 parent 31875d8
commit e5d44a7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "css-element-queries",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "CSS-Element-Queries Polyfill. proof-of-concept for high-speed element dimension/media queries in valid css.",
   "main": "index.js",
   "directories": {

diff --git a/src/ElementQueries.js b/src/ElementQueries.js
@@ -228,7 +228,7 @@
             for (var i in element.children) {
                 if(!element.children.hasOwnProperty(i)) continue;
 
-                if (element.children[i].tagName.toLowerCase() === 'img') {
+                if (element.children[i].tagName && element.children[i].tagName.toLowerCase() === 'img') {
                     children.push(element.children[i]);
 
                     var minWidth = element.children[i].getAttribute('min-width') || element.children[i].getAttribute('data-min-width');
@@ -297,6 +297,9 @@
                         children[imageToDisplay].style.display = 'block';
                         lastActiveImage = imageToDisplay;
                     }
+                } else {
+                    //make sure for initial check call the .src is set correctly
+                    children[imageToDisplay].src = sources[imageToDisplay];
                 }
             }
 
@@ -466,14 +469,14 @@
     var domLoaded = function (callback) {
         /* Internet Explorer */
         /*@cc_on
-        @if (@_win32 || @_win64)
-            document.write('<script id="ieScriptLoad" defer src="//:"><\/script>');
-            document.getElementById('ieScriptLoad').onreadystatechange = function() {
-                if (this.readyState == 'complete') {
-                    callback();
-                }
-            };
-        @end @*/
+         @if (@_win32 || @_win64)
+         document.write('<script id="ieScriptLoad" defer src="//:"><\/script>');
+         document.getElementById('ieScriptLoad').onreadystatechange = function() {
+         if (this.readyState == 'complete') {
+         callback();
+         }
+         };
+         @end @*/
         /* Mozilla, Chrome, Opera */
         if (document.addEventListener) {
             document.addEventListener('DOMContentLoaded', callback, false);
@@ -503,4 +506,4 @@
         window.ElementQueries = ElementQueries;
         ElementQueries.listen();
     }
-})();
+})();