X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ftraversing.js;h=737efa429b37199ff6827842a826654f31358545;hb=e534a310c7e99c44d93855ad5865ad5e985039ba;hp=92f58ba9cd51c02c12cfedfb3162fa0a565d5265;hpb=b0fe380cf89564305646bbd55d1fd7bd210fd591;p=jquery.git

diff --git a/src/traversing.js b/src/traversing.js
index 92f58ba..737efa4 100644
--- 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.filter(qualifier, filtered, !keep);
-		else qualifier = jQuery.filter( 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,20 +54,44 @@ 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], selector;
+
+			if ( cur ) {
+				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++ ) {
+						selector = selectors[i];
+						if ( selector.jquery ? selector.index(cur) > -1 : jQuery(cur).is(selector) ) {
+							selector = selector.selector || selector;
+							ret.push({ selector: selector, elem: cur });
+							selectors.splice(i--, 1);
+						}
+					}
+					cur = cur.parentNode;
+				}
+			}
+
+			return ret;
+		}
+
+		var pos = jQuery.expr.match.POS.test( selectors ) ? 
+			jQuery( selectors, context || this.context ) : null;
 
-		return this.map(function(){
-			var cur = this;
+		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;
 		});
 	},