Cut down on some more function calls for jQuery(...). Everything points back to the...

[jquery.git] / src / selector.js

diff --git a/src/selector.js b/src/selector.js
index 6538d97..2e6d8e1 100644 (file)
--- a/src/selector.js
+++ b/src/selector.js
@@ -1,5 +1,5 @@
 /*!
- * Sizzle CSS Selector Engine - v0.9.3
+ * Sizzle CSS Selector Engine - v1.0
  *  Copyright 2009, The Dojo Foundation
  *  Released under the MIT, BSD, and GPL Licenses.
  *  More information: http://sizzlejs.com/
@@ -12,16 +12,17 @@ var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^
 
 var Sizzle = function(selector, context, results, seed) {
        results = results || [];
-       context = context || document;
+       var origContext = context = context || document;
 
-       if ( context.nodeType !== 1 && context.nodeType !== 9 )
+       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;
+       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;
@@ -53,31 +54,43 @@ var Sizzle = function(selector, context, results, seed) {
                        }
                }
        } else {
-               var ret = seed ?
-                       { expr: parts.pop(), set: makeArray(seed) } :
-                       Sizzle.find( parts.pop(), parts.length === 1 && context.parentNode ? context.parentNode : context, isXML(context) );
-               set = Sizzle.filter( ret.expr, ret.set );
-
-               if ( parts.length > 0 ) {
-                       checkSet = makeArray(set);
-               } else {
-                       prune = false;
+               // Take a shortcut and set the context if the root selector is an ID
+               // (but not if it'll be faster if the inner selector is an ID)
+               if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+                               Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+                       var ret = Sizzle.find( parts.shift(), context, contextXML );
+                       context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];
                }
 
-               while ( parts.length ) {
-                       var cur = parts.pop(), pop = cur;
+               if ( context ) {
+                       var ret = seed ?
+                               { expr: parts.pop(), set: makeArray(seed) } :
+                               Sizzle.find( parts.pop(), parts.length === 1 && context.parentNode ? context.parentNode : context, contextXML );
+                       set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set;
 
-                       if ( !Expr.relative[ cur ] ) {
-                               cur = "";
+                       if ( parts.length > 0 ) {
+                               checkSet = makeArray(set);
                        } else {
-                               pop = parts.pop();
+                               prune = false;
                        }
 
-                       if ( pop == null ) {
-                               pop = context;
-                       }
+                       while ( parts.length ) {
+                               var cur = parts.pop(), pop = cur;
 
-                       Expr.relative[ cur ]( checkSet, pop, isXML(context) );
+                               if ( !Expr.relative[ cur ] ) {
+                                       cur = "";
+                               } else {
+                                       pop = parts.pop();
+                               }
+
+                               if ( pop == null ) {
+                                       pop = context;
+                               }
+
+                               Expr.relative[ cur ]( checkSet, pop, contextXML );
+                       }
+               } else {
+                       checkSet = parts = [];
                }
        }
 
@@ -92,7 +105,7 @@ var Sizzle = function(selector, context, results, seed) {
        if ( toString.call(checkSet) === "[object Array]" ) {
                if ( !prune ) {
                        results.push.apply( results, checkSet );
-               } else if ( context.nodeType === 1 ) {
+               } else if ( context && 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] );
@@ -110,7 +123,7 @@ var Sizzle = function(selector, context, results, seed) {
        }
 
        if ( extra ) {
-               Sizzle( extra, context, results, seed );
+               Sizzle( extra, origContext, results, seed );
 
                if ( sortOrder ) {
                        hasDuplicate = false;
@@ -692,20 +705,22 @@ if ( document.documentElement.compareDocumentPosition ) {
                }
                return ret;
        };
-} else if ( Array.prototype.indexOf ) {
-       var indexOf = Array.prototype.indexOf,
-               allSort = document.getElementsByTagName("*");
-
+} else if ( "sourceIndex" in document.documentElement ) {
        sortOrder = function( a, b ) {
-               var ret = indexOf.call( allSort, a ) - indexOf.call( allSort, b );
+               var ret = a.sourceIndex - b.sourceIndex;
                if ( ret === 0 ) {
                        hasDuplicate = true;
                }
                return ret;
        };
-} else if ( "sourceIndex" in document.documentElement ) {
+} else if ( document.createRange ) {
        sortOrder = function( a, b ) {
-               var ret = a.sourceIndex - b.sourceIndex;
+               var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
+               aRange.selectNode(a);
+               aRange.collapse(true);
+               bRange.selectNode(b);
+               bRange.collapse(true);
+               var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
                if ( ret === 0 ) {
                        hasDuplicate = true;
                }
@@ -948,7 +963,6 @@ var posProcess = function(selector, context){
 
 // EXPOSE
 jQuery.find = Sizzle;
-jQuery.filter = Sizzle.filter;
 jQuery.expr = Sizzle.selectors;
 jQuery.expr[":"] = jQuery.expr.filters;
 
@@ -966,7 +980,7 @@ Sizzle.selectors.filters.animated = function(elem){
        }).length;
 };
 
-jQuery.multiFilter = function( expr, elems, not ) {
+jQuery.filter = jQuery.multiFilter = function( expr, elems, not ) {
        if ( not ) {
                expr = ":not(" + expr + ")";
        }