Should improve performance of closest considerably. Benchmark proof in speed/closest...

[jquery.git] / src / traversing.js

diff --git a/src/traversing.js b/src/traversing.js
index 6776045..1633e2e 100644 (file)
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -1,40 +1,22 @@
+(function( jQuery ) {
+
 var runtil = /Until$/,
        rparentsprev = /^(?:parents|prevUntil|prevAll)/,
        // Note: This RegExp should be improved, or likely pulled from Sizzle
-       rmultiselector = /,/;
+       rmultiselector = /,/,
+       rchild = /^\s*>/,
+       isSimple = /^.[^:#\[\.,]*$/,
+       slice = Array.prototype.slice;
 
-// Implement the identical functionality for filter and not
-var winnow = function( elements, qualifier, keep ) {
-       if ( jQuery.isFunction( qualifier ) ) {
-               return jQuery.grep(elements, function( elem, i ) {
-                       var retVal = !!qualifier.call( elem, i, elem );
-                       return retVal === keep;
-               });
-
-       } else if ( qualifier.nodeType ) {
-               return jQuery.grep(elements, function( elem, i ) {
-                       return (elem === qualifier) === keep;
-               });
-
-       } else if ( typeof qualifier === "string" ) {
-               var filtered = jQuery.grep(elements, function( elem ) {
-                       return elem.nodeType === 1;
-               });
-
-               if ( isSimple.test( qualifier ) ) {
-                       return jQuery.filter(qualifier, filtered, !keep);
-               } else {
-                       qualifier = jQuery.filter( qualifier, filtered );
-               }
-       }
-
-       return jQuery.grep(elements, function( elem, i ) {
-               return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
-       });
-};
+var POS = jQuery.expr.match.POS;
 
 jQuery.fn.extend({
        find: function( selector ) {
+               // Handle "> div" child selectors and pass them to .children()
+               if ( typeof selector === "string" && rchild.test( selector ) ) {
+                       return this.children( selector.replace( rchild, "" ) );
+               }
+
                var ret = this.pushStack( "", "find", selector ), length = 0;
 
                for ( var i = 0, l = this.length; i < l; i++ ) {
@@ -81,8 +63,11 @@ jQuery.fn.extend({
        },
 
        closest: function( selectors, context ) {
+               var ret;
+
                if ( jQuery.isArray( selectors ) ) {
-                       var ret = [], cur = this[0], match, matches = {}, selector, level = 1;
+                       var cur = this[0], match, matches = {}, selector, level = 1;
+                       ret = [];
 
                        if ( cur && selectors.length ) {
                                for ( var i = 0, l = selectors.length; i < l; i++ ) {
@@ -103,6 +88,7 @@ jQuery.fn.extend({
                                                        ret.push({ selector: selector, elem: cur, level: level });
                                                }
                                        }
+
                                        cur = cur.parentNode;
                                        level++;
                                }
@@ -111,18 +97,30 @@ jQuery.fn.extend({
                        return ret;
                }
 
-               var pos = jQuery.expr.match.POS.test( selectors ) ? 
+               var pos = POS.test( selectors ) ? 
                        jQuery( selectors, context || this.context ) : null;
 
-               return this.map(function( i, cur ) {
-                       while ( cur && cur.ownerDocument && cur !== context ) {
-                               if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
-                                       return cur;
-                               }
-                               cur = cur.parentNode;
-                       }
-                       return null;
-               });
+    var ret = [];
+
+    for ( var i=0,j=this.length; i<j; i++ ) {
+      var cur = this[i];
+
+      while ( cur ) {
+        if ( pos ? pos.index(cur) > -1 : jQuery.find.matches(selectors, [cur]).length ) {
+                                       ret.push( cur );
+          break;
+                               } else {
+          cur = cur.parentNode;
+          if ( !cur.ownerDocument || cur === context ) {
+            break;
+          }
+        }
+      }
+    }
+
+               ret = ret.length > 1 ? jQuery.unique(ret) : ret;
+               
+               return this.pushStack( ret, "closest", selectors );
        },
        
        // Determine the position of an element within
@@ -269,3 +267,35 @@ jQuery.extend({
                return r;
        }
 });
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+       if ( jQuery.isFunction( qualifier ) ) {
+               return jQuery.grep(elements, function( elem, i ) {
+                       var retVal = !!qualifier.call( elem, i, elem );
+                       return retVal === keep;
+               });
+
+       } else if ( qualifier.nodeType ) {
+               return jQuery.grep(elements, function( elem, i ) {
+                       return (elem === qualifier) === keep;
+               });
+
+       } else if ( typeof qualifier === "string" ) {
+               var filtered = jQuery.grep(elements, function( elem ) {
+                       return elem.nodeType === 1;
+               });
+
+               if ( isSimple.test( qualifier ) ) {
+                       return jQuery.filter(qualifier, filtered, !keep);
+               } else {
+                       qualifier = jQuery.filter( qualifier, filtered );
+               }
+       }
+
+       return jQuery.grep(elements, function( elem, i ) {
+               return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
+       });
+}
+
+})( jQuery );