X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftraversing.js;h=737efa429b37199ff6827842a826654f31358545;hb=e534a310c7e99c44d93855ad5865ad5e985039ba;hp=b5a5a2dee176a9fd68bb1f91fb88aba606cb30c8;hpb=255068da33e3d131b3a641c041fb8cecb1543fa4;p=jquery.git

diff --git a/src/traversing.js b/src/traversing.js
index b5a5a2d..737efa4 100644
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -54,21 +54,43 @@ 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, context || this.context ) : null;
+	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, closer = 0;
+		return this.map(function(i, cur){
 			while ( cur && cur.ownerDocument && cur !== context ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) ) {
-					jQuery.lastCloser = closer;
+				if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
 					return cur;
 				}
 				cur = cur.parentNode;
-				closer++;
 			}
-			jQuery.lastCloser = -1;
 			return null;
 		});
 	},