The child selector-prefix branch doesn't work with selectors that have a larger depth...

[jquery.git] / src / traversing.js

diff --git a/src/traversing.js b/src/traversing.js
index 59110b0..3ed0a1c 100644 (file)
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -4,8 +4,10 @@ var runtil = /Until$/,
        rparentsprev = /^(?:parents|prevUntil|prevAll)/,
        // Note: This RegExp should be improved, or likely pulled from Sizzle
        rmultiselector = /,/,
+       rchild = /(^|,)\s*>/g,
        isSimple = /^.[^:#\[\.,]*$/,
-       slice = Array.prototype.slice;
+       slice = Array.prototype.slice,
+       POS = jQuery.expr.match.POS;
 
 jQuery.fn.extend({
        find: function( selector ) {
@@ -55,11 +57,13 @@ jQuery.fn.extend({
        },
 
        closest: function( selectors, context ) {
+               var ret = [], i, l, cur = this[0];
+
                if ( jQuery.isArray( selectors ) ) {
-                       var ret = [], cur = this[0], match, matches = {}, selector, level = 1;
+                       var match, matches = {}, selector, level = 1;
 
                        if ( cur && selectors.length ) {
-                               for ( var i = 0, l = selectors.length; i < l; i++ ) {
+                               for ( i = 0, l = selectors.length; i < l; i++ ) {
                                        selector = selectors[i];
 
                                        if ( !matches[selector] ) {
@@ -77,6 +81,7 @@ jQuery.fn.extend({
                                                        ret.push({ selector: selector, elem: cur, level: level });
                                                }
                                        }
+
                                        cur = cur.parentNode;
                                        level++;
                                }
@@ -85,18 +90,29 @@ 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;
+               for ( i = 0, l = this.length; i < l; i++ ) {
+                       cur = this[i];
+
+                       while ( cur ) {
+                               if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
+                                       ret.push( cur );
+                                       break;
+
+                               } else {
+                                       cur = cur.parentNode;
+                                       if ( !cur || !cur.ownerDocument || cur === context ) {
+                                               break;
+                                       }
                                }
-                               cur = cur.parentNode;
                        }
-                       return null;
-               });
+               }
+
+               ret = ret.length > 1 ? jQuery.unique(ret) : ret;
+               
+               return this.pushStack( ret, "closest", selectors );
        },
        
        // Determine the position of an element within
@@ -204,7 +220,9 @@ jQuery.extend({
                        expr = ":not(" + expr + ")";
                }
 
-               return jQuery.find.matches(expr, elems);
+               return elems.length === 1 ?
+                       jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
+                       jQuery.find.matches(expr, elems);
        },
        
        dir: function( elem, dir, until ) {