Prevent duplicate selectors from having to match in closest.

[jquery.git] / src / traversing.js

diff --git a/src/traversing.js b/src/traversing.js
index 8f1e5eb..609e2eb 100644 (file)
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -6,18 +6,21 @@ var winnow = function( elements, qualifier, 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 });
+               var filtered = jQuery.grep(elements, function(elem) { return elem.nodeType === 1; });
 
-               if(isSimple.test( qualifier )) return jQuery.multiFilter(qualifier, filtered, !keep);
-               else qualifier = jQuery.multiFilter( qualifier, elements );
+               if(isSimple.test( qualifier )) {
+                       return jQuery.filter(qualifier, filtered, !keep);
+               } else {
+                       qualifier = jQuery.filter( qualifier, elements );
+               }
        }
 
        return jQuery.grep(elements, function(elem, i) {
                return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
        });
-}
+};
 
 jQuery.fn.extend({
        find: function( selector ) {
@@ -51,26 +54,57 @@ jQuery.fn.extend({
                return this.pushStack( winnow(this, selector, true), "filter", selector );
        },
 
-       closest: function( selector, context ) {
-               var pos = jQuery.expr.match.POS.test( selector ) ? jQuery(selector) : null,
-                       closer = 0;
+       closest: function( selectors, context ) {
+               if ( jQuery.isArray( selectors ) ) {
+                       var ret = [], cur = this[0], match, selector, done;
+
+                       if ( cur && selectors.length ) {
+                               for ( var i = 0, l = selectors.length; i < l; i++ ) {
+                                       selectors[i] = jQuery.expr.match.POS.test( selector ) ? 
+                                               jQuery( selector, context || this.context ) :
+                                               selectors[i];
+                               }
+
+                               while ( cur && cur.ownerDocument && cur !== context ) {
+                                       for ( var i = 0; i < selectors.length; i++ ) {
+                                               match = selectors[i];
+                                               selector = match.selector || match;
 
-               return this.map(function(){
-                       var cur = this;
+                                               // Get rid of duplicate selectors
+                                               if ( selector === done ) {
+                                                       selectors.splice(i--, 1);
+
+                                               // See if we have a match
+                                               } else if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
+                                                       ret.push({ selector: selector, elem: cur });
+                                                       selectors.splice(i--, 1);
+                                                       done = selector;
+                                               }
+                                       }
+                                       cur = cur.parentNode;
+                               }
+                       }
+
+                       return ret;
+               }
+
+               var pos = jQuery.expr.match.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(selector) ) {
-                                       jQuery.data(cur, "closest", closer);
+                               if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
                                        return cur;
                                }
                                cur = cur.parentNode;
-                               closer++;
                        }
+                       return null;
                });
        },
 
-       add: function( selector ) {
+       add: function( selector, context ) {
                var set = typeof selector === "string" ?
-                               jQuery( selector ) :
+                               jQuery( selector, context || this.context ) :
                                jQuery.makeArray( selector ),
                        all = jQuery.merge( this.get(), set );
 
@@ -128,7 +162,7 @@ jQuery.each({
                var ret = jQuery.map( this, fn );
 
                if ( selector && typeof selector === "string" ) {
-                       ret = jQuery.multiFilter( selector, ret );
+                       ret = jQuery.filter( selector, ret );
                }
 
                ret = this.length > 1 ? jQuery.unique( ret ) : ret;
@@ -140,3 +174,49 @@ jQuery.each({
                return this.pushStack( ret, name, selector );
        };
 });
+
+jQuery.extend({
+       filter: function( expr, elems, not ) {
+               if ( not ) {
+                       expr = ":not(" + expr + ")";
+               }
+
+               return jQuery.find.matches(expr, elems);
+       },
+       
+       dir: function( elem, dir ) {
+               var matched = [], cur = elem[dir];
+               while ( cur && cur.nodeType !== 9 ) {
+                       if ( cur.nodeType === 1 ) {
+                               matched.push( cur );
+                       }
+                       cur = cur[dir];
+               }
+               return matched;
+       },
+
+       nth: function( cur, result, dir, elem ) {
+               result = result || 1;
+               var num = 0;
+
+               for ( ; cur; cur = cur[dir] ) {
+                       if ( cur.nodeType === 1 && ++num === result ) {
+                               break;
+                       }
+               }
+
+               return cur;
+       },
+
+       sibling: function( n, elem ) {
+               var r = [];
+
+               for ( ; n; n = n.nextSibling ) {
+                       if ( n.nodeType === 1 && n !== elem ) {
+                               r.push( n );
+                       }
+               }
+
+               return r;
+       }
+});