Switch back to using Sizzle.matchesSelector.

[jquery.git] / src / traversing.js

diff --git a/src/traversing.js b/src/traversing.js
index f7dde44..c473c75 100644 (file)
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -4,11 +4,18 @@ var runtil = /Until$/,
        rparentsprev = /^(?:parents|prevUntil|prevAll)/,
        // Note: This RegExp should be improved, or likely pulled from Sizzle
        rmultiselector = /,/,
+       rchild = /^\s*>/,
        isSimple = /^.[^:#\[\.,]*$/,
-       slice = Array.prototype.slice;
+       slice = Array.prototype.slice,
+       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++ ) {
@@ -56,9 +63,11 @@ jQuery.fn.extend({
 
        closest: function( selectors, context ) {
                var ret;
+
                if ( jQuery.isArray( selectors ) ) {
                        var cur = this[0], match, matches = {}, selector, level = 1;
                        ret = [];
+
                        if ( cur && selectors.length ) {
                                for ( var i = 0, l = selectors.length; i < l; i++ ) {
                                        selector = selectors[i];
@@ -78,26 +87,37 @@ jQuery.fn.extend({
                                                        ret.push({ selector: selector, elem: cur, level: level });
                                                }
                                        }
+
                                        cur = cur.parentNode;
                                        level++;
                                }
                        }
 
-                       return ret.length > 1 ? jQuery.unique(ret) : ret;
+                       return ret;
                }
 
-               var pos = jQuery.expr.match.POS.test( selectors ) ? 
+               var pos = POS.test( selectors ) ? 
                        jQuery( selectors, context || this.context ) : null;
-               ret = jQuery.map(this.get(),function( cur,i ) {
-                       while ( cur && cur.ownerDocument && cur !== context ) {
-                               if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
-                                       return cur;
+
+               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.matchesSelector(cur, selectors) ) {
+                                       ret.push( cur );
+                                       break;
+
+                               } else {
+                                       cur = cur.parentNode;
+                                       if ( !cur.ownerDocument || cur === context ) {
+                                               break;
+                                       }
                                }
-                               cur = cur.parentNode;
                        }
-                       return null;
-               });
-               
+               }
+
                ret = ret.length > 1 ? jQuery.unique(ret) : ret;
                
                return this.pushStack( ret, "closest", selectors );
@@ -208,7 +228,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 ) {