Make sure that the correct args are passed in to the filter callback (and by extensio...

[jquery.git] / src / traversing.js

diff --git a/src/traversing.js b/src/traversing.js
index 609e2eb..942138c 100644 (file)
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -1,16 +1,27 @@
+var runtil = /Until$/,
+       rparentsprev = /^(?:parents|prevUntil|prevAll)/,
+       // Note: This RegExp should be improved, or likely pulled from Sizzle
+       rmultiselector = /,/,
+       slice = Array.prototype.slice;
+
+// Implement the identical functionality for filter and not
 var winnow = function( elements, qualifier, keep ) {
-       if(jQuery.isFunction( qualifier )) {
+       if ( jQuery.isFunction( qualifier ) ) {
                return jQuery.grep(elements, function(elem, i) {
-                       return !!qualifier.call( elem, i ) === keep;
+                       return !!qualifier.call( elem, i, elem ) === keep;
                });
-       } else if( qualifier.nodeType ) {
+
+       } 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 )) {
+       } 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, elements );
@@ -46,6 +57,21 @@ jQuery.fn.extend({
                return ret;
        },
 
+       has: function( target ) {
+               var targets = jQuery( target );
+               return this.filter(function() {
+                       for ( var i = 0, l = targets.length; i < l; i++ ) {
+                               if ( jQuery.contains( this, targets[i] ) ) {
+                                       return true;
+                               }
+                       }
+               });
+       },
+
+       contains: function( target ) {
+               return this.has( target ).length > 0;
+       },
+
        not: function( selector ) {
                return this.pushStack( winnow(this, selector, false), "not", selector);
        },
@@ -56,29 +82,26 @@ jQuery.fn.extend({
 
        closest: function( selectors, context ) {
                if ( jQuery.isArray( selectors ) ) {
-                       var ret = [], cur = this[0], match, selector, done;
+                       var ret = [], cur = this[0], match, matches = {}, selector;
 
                        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];
+                                       selector = selectors[i];
+
+                                       if ( !matches[selector] ) {
+                                               matches[selector] = jQuery.expr.match.POS.test( selector ) ? 
+                                                       jQuery( selector, context || this.context ) :
+                                                       selector;
+                                       }
                                }
 
                                while ( cur && cur.ownerDocument && cur !== context ) {
-                                       for ( var i = 0; i < selectors.length; i++ ) {
-                                               match = selectors[i];
-                                               selector = match.selector || match;
-
-                                               // Get rid of duplicate selectors
-                                               if ( selector === done ) {
-                                                       selectors.splice(i--, 1);
+                                       for ( selector in matches ) {
+                                               match = matches[selector];
 
-                                               // See if we have a match
-                                               } else if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
+                                               if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
                                                        ret.push({ selector: selector, elem: cur });
-                                                       selectors.splice(i--, 1);
-                                                       done = selector;
+                                                       delete matches[selector];
                                                }
                                        }
                                        cur = cur.parentNode;
@@ -128,8 +151,8 @@ jQuery.fn.extend({
        },
 
        slice: function() {
-               return this.pushStack( Array.prototype.slice.apply( this, arguments ),
-                       "slice", Array.prototype.slice.call(arguments).join(",") );
+               return this.pushStack( slice.apply( this, arguments ),
+                       "slice", slice.call(arguments).join(",") );
        },
 
        map: function( callback ) {
@@ -150,16 +173,23 @@ jQuery.fn.extend({
 jQuery.each({
        parent: function(elem){return elem.parentNode;},
        parents: function(elem){return jQuery.dir(elem,"parentNode");},
+       parentsUntil: function(elem,i,until){return jQuery.dir(elem,"parentNode",until);},
        next: function(elem){return jQuery.nth(elem,2,"nextSibling");},
        prev: function(elem){return jQuery.nth(elem,2,"previousSibling");},
        nextAll: function(elem){return jQuery.dir(elem,"nextSibling");},
        prevAll: function(elem){return jQuery.dir(elem,"previousSibling");},
+       nextUntil: function(elem,i,until){return jQuery.dir(elem,"nextSibling",until);},
+       prevUntil: function(elem,i,until){return jQuery.dir(elem,"previousSibling",until);},
        siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},
        children: function(elem){return jQuery.sibling(elem.firstChild);},
        contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}
 }, function(name, fn){
-       jQuery.fn[ name ] = function( selector ) {
-               var ret = jQuery.map( this, fn );
+       jQuery.fn[ name ] = function( until, selector ) {
+               var ret = jQuery.map( this, fn, until );
+               
+               if ( !runtil.test( name ) ) {
+                       selector = until;
+               }
 
                if ( selector && typeof selector === "string" ) {
                        ret = jQuery.filter( selector, ret );
@@ -167,11 +197,11 @@ jQuery.each({
 
                ret = this.length > 1 ? jQuery.unique( ret ) : ret;
 
-               if ( name === "parents" && this.length > 1 ) {
+               if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
                        ret = ret.reverse();
                }
 
-               return this.pushStack( ret, name, selector );
+               return this.pushStack( ret, name, slice.call(arguments).join(",") );
        };
 });
 
@@ -184,9 +214,9 @@ jQuery.extend({
                return jQuery.find.matches(expr, elems);
        },
        
-       dir: function( elem, dir ) {
+       dir: function( elem, dir, until ) {
                var matched = [], cur = elem[dir];
-               while ( cur && cur.nodeType !== 9 ) {
+               while ( cur && cur.nodeType !== 9 && (until === undefined || !jQuery( cur ).is( until )) ) {
                        if ( cur.nodeType === 1 ) {
                                matched.push( cur );
                        }