X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ftraversing.js;h=67760450f300d60c876f556615ff73151a89ff4a;hb=a33d01a7b09f2b3b06ba273b89b77fec8d20b144;hp=a09ae19377348ad808283a85a6d78e5ffb9fd795;hpb=61e37d41490aed319a176c6ca7feb95e5505059c;p=jquery.git

diff --git a/src/traversing.js b/src/traversing.js
index a09ae19..6776045 100644
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -1,14 +1,14 @@
 var runtil = /Until$/,
 	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
 	// Note: This RegExp should be improved, or likely pulled from Sizzle
-	rmultiselector = /,/,
-	slice = Array.prototype.slice;
+	rmultiselector = /,/;
 
 // Implement the identical functionality for filter and not
 var winnow = function( elements, qualifier, keep ) {
 	if ( jQuery.isFunction( qualifier ) ) {
 		return jQuery.grep(elements, function( elem, i ) {
-			return !!qualifier.call( elem, i, elem ) === keep;
+			var retVal = !!qualifier.call( elem, i, elem );
+			return retVal === keep;
 		});
 
 	} else if ( qualifier.nodeType ) {
@@ -24,7 +24,7 @@ var winnow = function( elements, qualifier, keep ) {
 		if ( isSimple.test( qualifier ) ) {
 			return jQuery.filter(qualifier, filtered, !keep);
 		} else {
-			qualifier = jQuery.filter( qualifier, elements );
+			qualifier = jQuery.filter( qualifier, filtered );
 		}
 	}
 
@@ -82,7 +82,7 @@ jQuery.fn.extend({
 
 	closest: function( selectors, context ) {
 		if ( jQuery.isArray( selectors ) ) {
-			var ret = [], cur = this[0], match, matches = {}, selector;
+			var ret = [], cur = this[0], match, matches = {}, selector, level = 1;
 
 			if ( cur && selectors.length ) {
 				for ( var i = 0, l = selectors.length; i < l; i++ ) {
@@ -100,11 +100,11 @@ jQuery.fn.extend({
 						match = matches[selector];
 
 						if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
-							ret.push({ selector: selector, elem: cur });
-							delete matches[selector];
+							ret.push({ selector: selector, elem: cur, level: level });
 						}
 					}
 					cur = cur.parentNode;
+					level++;
 				}
 			}
 
@@ -146,9 +146,9 @@ jQuery.fn.extend({
 				jQuery.makeArray( selector ),
 			all = jQuery.merge( this.get(), set );
 
-		return this.pushStack( set[0] && (set[0].setInterval || set[0].nodeType === 9 || (set[0].parentNode && set[0].parentNode.nodeType !== 11)) ?
-			jQuery.unique( all ) :
-			all );
+		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
+			all :
+			jQuery.unique( all ) );
 	},
 
 	andSelf: function() {
@@ -156,6 +156,12 @@ jQuery.fn.extend({
 	}
 });
 
+// A painfully simple check to see if an element is disconnected
+// from a document (should be improved, where feasible).
+function isDisconnected( node ) {
+	return !node || !node.parentNode || node.parentNode.nodeType === 11;
+}
+
 jQuery.each({
 	parent: function( elem ) {
 		var parent = elem.parentNode;
@@ -229,7 +235,7 @@ jQuery.extend({
 	
 	dir: function( elem, dir, until ) {
 		var matched = [], cur = elem[dir];
-		while ( cur && cur.nodeType !== 9 && (until === undefined || !jQuery( cur ).is( until )) ) {
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
 			if ( cur.nodeType === 1 ) {
 				matched.push( cur );
 			}