Merge branch 'closestbug-6700' of http://github.com/ajpiano/jquery into ajpiano-closestbug-6700

2 files changed, 14 insertions, 6 deletions

diff --git a/src/traversing.js b/src/traversing.js
index 59110b096..f7dde44ec 100644
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -55,9 +55,10 @@ 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++ ) {
 					selector = selectors[i];
@@ -82,13 +83,12 @@ jQuery.fn.extend({
 				}
 			}
 
-			return ret;
+			return ret.length > 1 ? jQuery.unique(ret) : ret;
 		}
 
 		var pos = jQuery.expr.match.POS.test( selectors ) ? 
 			jQuery( selectors, context || this.context ) : null;
-
-		return this.map(function( i, cur ) {
+		ret = jQuery.map(this.get(),function( cur,i ) {
 			while ( cur && cur.ownerDocument && cur !== context ) {
 				if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
 					return cur;
@@ -97,6 +97,10 @@ jQuery.fn.extend({
 			}
 			return null;
 		});
+		
+		ret = ret.length > 1 ? jQuery.unique(ret) : ret;
+		
+		return this.pushStack( ret, "closest", selectors );
 	},
 	
 	// Determine the position of an element within
diff --git a/test/unit/traversing.js b/test/unit/traversing.js
index 4233f70f9..c7279cfe5 100644
--- a/test/unit/traversing.js
+++ b/test/unit/traversing.js
@@ -120,7 +120,7 @@ test("filter(jQuery)", function() {
 })
 
 test("closest()", function() {
-	expect(9);
+	expect(10);
 	same( jQuery("body").closest("body").get(), q("body"), "closest(body)" );
 	same( jQuery("body").closest("html").get(), q("html"), "closest(html)" );
 	same( jQuery("body").closest("div").get(), [], "closest(div)" );
@@ -134,6 +134,10 @@ test("closest()", function() {
 	same( jq.closest("html", document.body).get(), [], "Context limited." );
 	same( jq.closest("body", document.body).get(), [], "Context limited." );
 	same( jq.closest("#nothiddendiv", document.body).get(), q("nothiddendiv"), "Context not reached." );
+	
+	//Test that .closest() returns unique'd set
+	equals( jQuery('#main p').closest('#main').length, 1, "Closest should return a unique set" );
+	
 });
 
 test("closest(Array)", function() {