Merged in from Sizzle - a change to child filter selector logic.
[jquery.git] / src / selector.js
index 8ade53b..085f0b3 100644 (file)
@@ -1,16 +1,16 @@
-/*
- * Sizzle CSS Selector Engine - v0.9
- *  Copyright 2009, John Resig (http://ejohn.org/)
- *  released under the MIT License
+/*!
+ * Sizzle CSS Selector Engine - v0.9.1
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
  */
 (function(){
 
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|[^[\]]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g;
-
-var done = 0;
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|[^[\]]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,
+       done = 0,
+       toString = Object.prototype.toString;
 
 var Sizzle = function(selector, context, results, seed) {
-       var doCache = !results;
        results = results || [];
        context = context || document;
 
@@ -21,7 +21,7 @@ var Sizzle = function(selector, context, results, seed) {
                return results;
        }
 
-       var parts = [], m, set, checkSet, check, mode, extra;
+       var parts = [], m, set, checkSet, check, mode, extra, prune = true;
        
        // Reset the position of the chunker regexp (start from head)
        chunker.lastIndex = 0;
@@ -73,6 +73,8 @@ var Sizzle = function(selector, context, results, seed) {
 
                if ( parts.length > 0 ) {
                        checkSet = makeArray(set);
+               } else {
+                       prune = false;
                }
 
                while ( parts.length ) {
@@ -88,7 +90,7 @@ var Sizzle = function(selector, context, results, seed) {
                                pop = context;
                        }
 
-                       Expr.relative[ cur ]( checkSet, pop );
+                       Expr.relative[ cur ]( checkSet, pop, isXML(context) );
                }
        }
 
@@ -100,8 +102,10 @@ var Sizzle = function(selector, context, results, seed) {
                throw "Syntax error, unrecognized expression: " + (cur || selector);
        }
 
-       if ( checkSet instanceof Array ) {
-               if ( context.nodeType === 1 ) {
+       if ( toString.call(checkSet) === "[object Array]" ) {
+               if ( !prune ) {
+                       results.push.apply( results, checkSet );
+               } else if ( context.nodeType === 1 ) {
                        for ( var i = 0; checkSet[i] != null; i++ ) {
                                if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
                                        results.push( set[i] );
@@ -160,7 +164,7 @@ Sizzle.find = function(expr, context){
        return {set: set, expr: expr};
 };
 
-Sizzle.filter = function(expr, set, inplace){
+Sizzle.filter = function(expr, set, inplace, not){
        var old = expr, result = [], curLoop = set, match, anyFound;
 
        while ( expr && set.length ) {
@@ -174,9 +178,13 @@ Sizzle.filter = function(expr, set, inplace){
                                }
 
                                if ( Expr.preFilter[ type ] ) {
-                                       match = Expr.preFilter[ type ]( match, curLoop );
+                                       match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not );
 
-                                       if ( match[0] === true ) {
+                                       if ( !match ) {
+                                               anyFound = found = true;
+                                       } else if ( match === true ) {
+                                               continue;
+                                       } else if ( match[0] === true ) {
                                                goodArray = [];
                                                var last = null, elem;
                                                for ( var i = 0; (elem = curLoop[i]) !== undefined; i++ ) {
@@ -188,21 +196,26 @@ Sizzle.filter = function(expr, set, inplace){
                                        }
                                }
 
-                               for ( var i = 0; (item = curLoop[i]) !== undefined; i++ ) {
-                                       if ( item ) {
-                                               if ( goodArray && item != goodArray[goodPos] ) {
-                                                       goodPos++;
-                                               }
-
-                                               found = filter( item, match, goodPos, goodArray );
-                                               if ( inplace && found != null ) {
-                                                       curLoop[i] = found ? curLoop[i] : false;
-                                                       if ( found ) {
+                               if ( match ) {
+                                       for ( var i = 0; (item = curLoop[i]) !== undefined; i++ ) {
+                                               if ( item ) {
+                                                       if ( goodArray && item != goodArray[goodPos] ) {
+                                                               goodPos++;
+                                                       }
+       
+                                                       found = filter( item, match, goodPos, goodArray );
+                                                       var pass = not ^ !!found;
+
+                                                       if ( inplace && found != null ) {
+                                                               if ( pass ) {
+                                                                       anyFound = true;
+                                                               } else {
+                                                                       curLoop[i] = false;
+                                                               }
+                                                       } else if ( pass ) {
+                                                               result.push( item );
                                                                anyFound = true;
                                                        }
-                                               } else if ( found ) {
-                                                       result.push( item );
-                                                       anyFound = true;
                                                }
                                        }
                                }
@@ -243,17 +256,18 @@ Sizzle.filter = function(expr, set, inplace){
 var Expr = Sizzle.selectors = {
        order: [ "ID", "NAME", "TAG" ],
        match: {
-               ID: /#((?:[\w\u0128-\uFFFF_-]|\\.)+)/,
-               CLASS: /\.((?:[\w\u0128-\uFFFF_-]|\\.)+)/,
-               NAME: /\[name=['"]*((?:[\w\u0128-\uFFFF_-]|\\.)+)['"]*\]/,
-               ATTR: /\[((?:[\w\u0128-\uFFFF_-]|\\.)+)\s*(?:(\S{0,1}=)\s*(['"]*)(.*?)\3|)\]/,
-               TAG: /^((?:[\w\u0128-\uFFFF\*_-]|\\.)+)/,
-               CHILD: /:(only|nth|last|first)-child\(?(even|odd|[\dn+-]*)\)?/,
-               POS: /:(nth|eq|gt|lt|first|last|even|odd)\(?(\d*)\)?(?:[^-]|$)/,
-               PSEUDO: /:((?:[\w\u0128-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/
+               ID: /#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,
+               CLASS: /\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,
+               NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,
+               ATTR: /\[((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\]/,
+               TAG: /^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,
+               CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,
+               POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,
+               PSEUDO: /:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/
        },
        attrMap: {
-               "class": "className"
+               "class": "className",
+               "for": "htmlFor"
        },
        relative: {
                "+": function(checkSet, part){
@@ -274,9 +288,9 @@ var Expr = Sizzle.selectors = {
                                Sizzle.filter( part, checkSet, true );
                        }
                },
-               ">": function(checkSet, part){
+               ">": function(checkSet, part, isXML){
                        if ( typeof part === "string" && !/\W/.test(part) ) {
-                               part = part.toUpperCase();
+                               part = isXML ? part : part.toUpperCase();
 
                                for ( var i = 0, l = checkSet.length; i < l; i++ ) {
                                        var elem = checkSet[i];
@@ -300,21 +314,21 @@ var Expr = Sizzle.selectors = {
                                }
                        }
                },
-               "": function(checkSet, part){
+               "": function(checkSet, part, isXML){
                        var doneName = "done" + (done++), checkFn = dirCheck;
 
                        if ( !part.match(/\W/) ) {
-                               var nodeCheck = part = part.toUpperCase();
+                               var nodeCheck = part = isXML ? part : part.toUpperCase();
                                checkFn = dirNodeCheck;
                        }
 
                        checkFn("parentNode", part, doneName, checkSet, nodeCheck);
                },
-               "~": function(checkSet, part){
+               "~": function(checkSet, part, isXML){
                        var doneName = "done" + (done++), checkFn = dirCheck;
 
                        if ( typeof part === "string" && !part.match(/\W/) ) {
-                               var nodeCheck = part = part.toUpperCase();
+                               var nodeCheck = part = isXML ? part : part.toUpperCase();
                                checkFn = dirNodeCheck;
                        }
 
@@ -336,14 +350,26 @@ var Expr = Sizzle.selectors = {
                }
        },
        preFilter: {
-               CLASS: function(match){
-                       return new RegExp( "(?:^|\\s)" + match[1] + "(?:\\s|$)" );
+               CLASS: function(match, curLoop, inplace, result, not){
+                       match = " " + match[1].replace(/\\/g, "") + " ";
+
+                       for ( var i = 0; curLoop[i]; i++ ) {
+                               if ( not ^ (" " + curLoop[i].className + " ").indexOf(match) >= 0 ) {
+                                       if ( !inplace )
+                                               result.push( curLoop[i] );
+                               } else if ( inplace ) {
+                                       curLoop[i] = false;
+                               }
+                       }
+
+                       return false;
                },
                ID: function(match){
-                       return match[1];
+                       return match[1].replace(/\\/g, "");
                },
-               TAG: function(match){
-                       return match[1].toUpperCase();
+               TAG: function(match, curLoop){
+                       for ( var i = 0; !curLoop[i]; i++ ){}
+                       return isXML(curLoop[i]) ? match[1] : match[1].toUpperCase();
                },
                CHILD: function(match){
                        if ( match[1] == "nth" ) {
@@ -375,12 +401,20 @@ var Expr = Sizzle.selectors = {
 
                        return match;
                },
-               PSEUDO: function(match, curLoop){
+               PSEUDO: function(match, curLoop, inplace, result, not){
                        if ( match[1] === "not" ) {
                                // If we're dealing with a complex expression, or a simple one
-                               match[3] = match[3].match(chunker).length > 1 ?
-                                       Sizzle(match[3], null, null, curLoop) :
-                                       Sizzle.filter(match[3], curLoop);
+                               if ( match[3].match(chunker).length > 1 ) {
+                                       match[3] = Sizzle(match[3], null, null, curLoop);
+                               } else {
+                                       var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+                                       if ( !inplace ) {
+                                               result.push.apply( result, ret );
+                                       }
+                                       return false;
+                               }
+                       } else if ( Expr.match.POS.test( match[0] ) ) {
+                               return true;
                        }
                        
                        return match;
@@ -479,9 +513,9 @@ var Expr = Sizzle.selectors = {
                CHILD: function(elem, match){
                        var type = match[1], parent = elem.parentNode;
 
-                       var doneName = match[0];
+                       var doneName = "child" + parent.childNodes.length;
                        
-                       if ( parent && !parent[ doneName ] ) {
+                       if ( parent && (!parent[ doneName ] || !elem.nodeIndex) ) {
                                var count = 1;
 
                                for ( var node = parent.firstChild; node; node = node.nextSibling ) {
@@ -602,7 +636,7 @@ try {
        makeArray = function(array, results) {
                var ret = results || [];
 
-               if ( array instanceof Array ) {
+               if ( toString.call(array) === "[object Array]" ) {
                        Array.prototype.push.apply( ret, array );
                } else {
                        if ( typeof array.length === "number" ) {
@@ -689,7 +723,7 @@ if ( document.querySelectorAll ) (function(){
 
                if ( !seed && context.nodeType === 9 ) {
                        try {
-                               return makeArray( context.querySelectorAll(query) );
+                               return makeArray( context.querySelectorAll(query), extra );
                        } catch(e){}
                }
                
@@ -778,7 +812,12 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck ) {
 var contains = document.compareDocumentPosition ?  function(a, b){
        return a.compareDocumentPosition(b) & 16;
 } : function(a, b){
-       return a !== b && a.contains ? a.contains(b) : true;
+       return a !== b && (a.contains ? a.contains(b) : true);
+};
+
+var isXML = function(elem){
+       return elem.documentElement && !elem.body ||
+               elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
 };
 
 // EXPOSE