diff --git a/src/ElementQueries.js b/src/ElementQueries.js index 2e4b566..6e7c357 100755 --- a/src/ElementQueries.js +++ b/src/ElementQueries.js @@ -179,17 +179,19 @@ } } - var regex = /,?([^,\n]*)\[[\s\t]*(min|max)-(width|height)[\s\t]*[~$\^]?=[\s\t]*"([^"]*)"[\s\t]*]([^\n\s\{]*)/mgi; + var regex = /,?([^,\n]*?)\[[\s\t]*?(min|max)-(width|height)[\s\t]*?[~$\^]?=[\s\t]*?"([^"]*?)"[\s\t]*?]([^\n\s\{]*?)/mgi; /** * @param {String} css */ function extractQuery(css) { var match; + var smatch; css = css.replace(/'/g, '"'); while (null !== (match = regex.exec(css))) { if (5 < match.length) { - queueQuery(match[1] || match[5], match[2], match[3], match[4]); + smatch = match[1] || match[5] || smatch; + queueQuery(smatch, match[2], match[3], match[4]); } } } diff --git a/src/ResizeSensor.js b/src/ResizeSensor.js index 3d0d599..65315d2 100755 --- a/src/ResizeSensor.js +++ b/src/ResizeSensor.js @@ -125,8 +125,11 @@ addEvent(expand, 'scroll', onScroll); addEvent(shrink, 'scroll', onScroll); } - - if ("[object Array]" === Object.prototype.toString.call(element) + + var elementType = Object.prototype.toString.call(element); + if ('[object Array]' === elementType + || ('[object NodeList]' === elementTyle) + || ('[object HTMLCollection]' === elementTyle) || ('undefined' !== typeof jQuery && element instanceof jQuery) //jquery || ('undefined' !== typeof Elements && element instanceof Elements) //mootools ) { @@ -151,4 +154,4 @@ } }; -})(); \ No newline at end of file +})();