X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ftraversing.js;h=1633e2e162d6fea779ef680355a2edd0d22a618b;hb=0ca35de311ff4d1dac5c9dc4de05a32a1754cd7a;hp=d485d691a66297c289222b498eba4337b212c021;hpb=8effe3a7dee91c833cc1774646da9d743600c64c;p=jquery.git

diff --git a/src/traversing.js b/src/traversing.js
index d485d69..1633e2e 100644
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -1,12 +1,22 @@
+(function( jQuery ) {
+
 var runtil = /Until$/,
 	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
 	// Note: This RegExp should be improved, or likely pulled from Sizzle
 	rmultiselector = /,/,
+	rchild = /^\s*>/,
 	isSimple = /^.[^:#\[\.,]*$/,
 	slice = Array.prototype.slice;
 
+var POS = jQuery.expr.match.POS;
+
 jQuery.fn.extend({
 	find: function( selector ) {
+		// Handle "> div" child selectors and pass them to .children()
+		if ( typeof selector === "string" && rchild.test( selector ) ) {
+			return this.children( selector.replace( rchild, "" ) );
+		}
+
 		var ret = this.pushStack( "", "find", selector ), length = 0;
 
 		for ( var i = 0, l = this.length; i < l; i++ ) {
@@ -53,8 +63,11 @@ jQuery.fn.extend({
 	},
 
 	closest: function( selectors, context ) {
+		var ret;
+
 		if ( jQuery.isArray( selectors ) ) {
-			var ret = [], cur = this[0], match, matches = {}, selector, level = 1;
+			var cur = this[0], match, matches = {}, selector, level = 1;
+			ret = [];
 
 			if ( cur && selectors.length ) {
 				for ( var i = 0, l = selectors.length; i < l; i++ ) {
@@ -75,6 +88,7 @@ jQuery.fn.extend({
 							ret.push({ selector: selector, elem: cur, level: level });
 						}
 					}
+
 					cur = cur.parentNode;
 					level++;
 				}
@@ -83,18 +97,30 @@ jQuery.fn.extend({
 			return ret;
 		}
 
-		var pos = jQuery.expr.match.POS.test( selectors ) ? 
+		var pos = 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(selectors) ) {
-					return cur;
-				}
-				cur = cur.parentNode;
-			}
-			return null;
-		});
+    var ret = [];
+
+    for ( var i=0,j=this.length; i<j; i++ ) {
+      var cur = this[i];
+
+      while ( cur ) {
+        if ( pos ? pos.index(cur) > -1 : jQuery.find.matches(selectors, [cur]).length ) {
+					ret.push( cur );
+          break;
+				} else {
+          cur = cur.parentNode;
+          if ( !cur.ownerDocument || cur === context ) {
+            break;
+          }
+        }
+      }
+    }
+
+		ret = ret.length > 1 ? jQuery.unique(ret) : ret;
+		
+		return this.pushStack( ret, "closest", selectors );
 	},
 	
 	// Determine the position of an element within
@@ -270,4 +296,6 @@ function winnow( elements, qualifier, keep ) {
 	return jQuery.grep(elements, function( elem, i ) {
 		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
 	});
-};
\ No newline at end of file
+}
+
+})( jQuery );