diff options
| author | David DeSandro <desandrocodes@gmail.com> | 2014-04-20 18:48:00 -0400 |
|---|---|---|
| committer | David DeSandro <desandrocodes@gmail.com> | 2014-04-20 18:48:00 -0400 |
| commit | 0c0de543c93d85c6a75118261a66bee455e6fe03 (patch) | |
| tree | 085a1c910f5906e58739099d5e3dc5df3e8fec90 | |
| parent | ffd3fcfa3ef94329a2fe280c7fb25230188d5d60 (diff) | |
| download | imagesloaded-0c0de543c93d85c6a75118261a66bee455e6fe03.zip imagesloaded-0c0de543c93d85c6a75118261a66bee455e6fe03.tar.gz imagesloaded-0c0de543c93d85c6a75118261a66bee455e6fe03.tar.bz2 | |
do not test non-element text nodes; Fixes #143
| -rw-r--r-- | imagesloaded.js | 4 | ||||
| -rw-r--r-- | test/index.html | 1 | ||||
| -rw-r--r-- | test/non-element.js | 13 |
3 files changed, 18 insertions, 0 deletions
diff --git a/imagesloaded.js b/imagesloaded.js index 6d5eeaf..ade13e1 100644 --- a/imagesloaded.js +++ b/imagesloaded.js @@ -137,6 +137,10 @@ function makeArray( obj ) { this.addImage( elem ); } // find children + // no non-element nodes, #143 + if ( !elem.nodeType || !( elem.nodeType === 1 || elem.nodeType === 9 ) ) { + continue; + } var childElems = elem.querySelectorAll('img'); // concat childElems to filterFound array for ( var j=0, jLen = childElems.length; j < jLen; j++ ) { diff --git a/test/index.html b/test/index.html index e41afc2..1a5cc01 100644 --- a/test/index.html +++ b/test/index.html @@ -24,6 +24,7 @@ <script src="no-images.js"></script> <script src="jquery-success.js"></script> <script src="jquery-fail.js"></script> + <script src="non-element.js"></script> </head> <body> diff --git a/test/non-element.js b/test/non-element.js new file mode 100644 index 0000000..b999400 --- /dev/null +++ b/test/non-element.js @@ -0,0 +1,13 @@ +test( 'dismiss non-element nodes', function() { + + 'use strict'; + + var $ = window.jQuery; + stop(); + $(' <img src="http://lorempixel.com/401/301/" /> <img src="http://lorempixel.com/402/302/" /> ') + .imagesLoaded(function() { + ok( true, 'elements from jQuery string ok' ); + start(); + }); + +}); |