Standardize on using .nodeName in place of .tagName. Fixes jQuery bug #4923.

[jquery.git] / src / selector.js

diff --git a/src/selector.js b/src/selector.js
index fcab67f..c6fc025 100644 (file)
--- a/src/selector.js
+++ b/src/selector.js
@@ -8,7 +8,8 @@
 
 var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,
        done = 0,
-       toString = Object.prototype.toString;
+       toString = Object.prototype.toString,
+       hasDuplicate = false;
 
 var Sizzle = function(selector, context, results, seed) {
        results = results || [];
@@ -17,19 +18,19 @@ var Sizzle = function(selector, context, results, seed) {
        if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
                return [];
        }
-
+       
        if ( !selector || typeof selector !== "string" ) {
                return results;
        }
 
        var parts = [], m, set, checkSet, check, mode, extra, prune = true, contextXML = isXML(context);
-
+       
        // Reset the position of the chunker regexp (start from head)
        chunker.lastIndex = 0;
-
+       
        while ( (m = chunker.exec(selector)) !== null ) {
                parts.push( m[1] );
-
+               
                if ( m[2] ) {
                        extra = RegExp.rightContext;
                        break;
@@ -158,7 +159,7 @@ Sizzle.find = function(expr, context, isXML){
 
        for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
                var type = Expr.order[i], match;
-
+               
                if ( (match = Expr.match[ type ].exec( expr )) ) {
                        var left = RegExp.leftContext;
 
@@ -331,7 +332,7 @@ var Expr = Sizzle.selectors = {
                "": function(checkSet, part, isXML){
                        var doneName = done++, checkFn = dirCheck;
 
-                       if ( !part.match(/\W/) ) {
+                       if ( !/\W/.test(part) ) {
                                var nodeCheck = part = isXML ? part : part.toUpperCase();
                                checkFn = dirNodeCheck;
                        }
@@ -341,7 +342,7 @@ var Expr = Sizzle.selectors = {
                "~": function(checkSet, part, isXML){
                        var doneName = done++, checkFn = dirCheck;
 
-                       if ( typeof part === "string" && !part.match(/\W/) ) {
+                       if ( typeof part === "string" && !/\W/.test(part) ) {
                                var nodeCheck = part = isXML ? part : part.toUpperCase();
                                checkFn = dirNodeCheck;
                        }
@@ -420,7 +421,7 @@ var Expr = Sizzle.selectors = {
                },
                ATTR: function(match, curLoop, inplace, result, not, isXML){
                        var name = match[1].replace(/\\/g, "");
-
+                       
                        if ( !isXML && Expr.attrMap[name] ) {
                                match[1] = Expr.attrMap[name];
                        }
@@ -434,7 +435,7 @@ var Expr = Sizzle.selectors = {
                PSEUDO: function(match, curLoop, inplace, result, not){
                        if ( match[1] === "not" ) {
                                // If we're dealing with a complex expression, or a simple one
-                               if ( match[3].match(chunker).length > 1 || /^\w/.test(match[3]) ) {
+                               if ( chunker.exec(match[3]).length > 1 || /^\w/.test(match[3]) ) {
                                        match[3] = Sizzle(match[3], null, null, curLoop);
                                } else {
                                        var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
@@ -446,7 +447,7 @@ var Expr = Sizzle.selectors = {
                        } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
                                return true;
                        }
-
+                       
                        return match;
                },
                POS: function(match){
@@ -550,7 +551,7 @@ var Expr = Sizzle.selectors = {
                        } else if ( name === "not" ) {
                                var not = match[3];
 
-                               for ( var i = 0, l = not.length; i < l; i++ ) {
+                               for ( i = 0, l = not.length; i < l; i++ ) {
                                        if ( not[i] === elem ) {
                                                return false;
                                        }
@@ -564,13 +565,13 @@ var Expr = Sizzle.selectors = {
                        switch (type) {
                                case 'only':
                                case 'first':
-                                       while (node = node.previousSibling)  {
+                                       while ( (node = node.previousSibling) )  {
                                                if ( node.nodeType === 1 ) return false;
                                        }
                                        if ( type == 'first') return true;
                                        node = elem;
                                case 'last':
-                                       while (node = node.nextSibling)  {
+                                       while ( (node = node.nextSibling) )  {
                                                if ( node.nodeType === 1 ) return false;
                                        }
                                        return true;
@@ -580,20 +581,20 @@ var Expr = Sizzle.selectors = {
                                        if ( first == 1 && last == 0 ) {
                                                return true;
                                        }
-
+                                       
                                        var doneName = match[0],
                                                parent = elem.parentNode;
-
+       
                                        if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
                                                var count = 0;
                                                for ( node = parent.firstChild; node; node = node.nextSibling ) {
                                                        if ( node.nodeType === 1 ) {
                                                                node.nodeIndex = ++count;
                                                        }
-                                               }
+                                               } 
                                                parent.sizcache = doneName;
                                        }
-
+                                       
                                        var diff = elem.nodeIndex - last;
                                        if ( first == 0 ) {
                                                return diff == 0;
@@ -666,7 +667,7 @@ var makeArray = function(array, results) {
                results.push.apply( results, array );
                return results;
        }
-
+       
        return array;
 };
 
@@ -760,6 +761,7 @@ if ( document.documentElement.compareDocumentPosition ) {
        }
 
        root.removeChild( form );
+       root = form = null; // release memory in IE
 })();
 
 (function(){
@@ -800,6 +802,8 @@ if ( document.documentElement.compareDocumentPosition ) {
                        return elem.getAttribute("href", 2);
                };
        }
+
+       div = null; // release memory in IE
 })();
 
 if ( document.querySelectorAll ) (function(){
@@ -811,7 +815,7 @@ if ( document.querySelectorAll ) (function(){
        if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
                return;
        }
-
+       
        Sizzle = function(query, context, extra, seed){
                context = context || document;
 
@@ -822,13 +826,15 @@ if ( document.querySelectorAll ) (function(){
                                return makeArray( context.querySelectorAll(query), extra );
                        } catch(e){}
                }
-
+               
                return oldSizzle(query, context, extra, seed);
        };
 
        for ( var prop in oldSizzle ) {
                Sizzle[ prop ] = oldSizzle[ prop ];
        }
+
+       div = null; // release memory in IE
 })();
 
 if ( document.getElementsByClassName && document.documentElement.getElementsByClassName ) (function(){
@@ -851,6 +857,8 @@ if ( document.getElementsByClassName && document.documentElement.getElementsByCl
                        return context.getElementsByClassName(match[1]);
                }
        };
+
+       div = null; // release memory in IE
 })();
 
 function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
@@ -969,11 +977,17 @@ jQuery.expr = Sizzle.selectors;
 jQuery.expr[":"] = jQuery.expr.filters;
 
 Sizzle.selectors.filters.hidden = function(elem){
-       return elem.offsetWidth === 0 && elem.offsetHeight === 0;
+       var width = elem.offsetWidth, height = elem.offsetHeight,
+                force = /^tr$/i.test( elem.nodeName ); // ticket #4512
+       return ( width === 0 && height === 0 && !force ) ?
+               true :
+                       ( width !== 0 && height !== 0 && !force ) ?
+                               false :
+                                       !!( jQuery.curCSS(elem, "display") === "none" );
 };
 
 Sizzle.selectors.filters.visible = function(elem){
-       return elem.offsetWidth > 0 || elem.offsetHeight > 0;
+       return !Sizzle.selectors.filters.hidden(elem);
 };
 
 Sizzle.selectors.filters.animated = function(elem){