.closest() should return a unique set of elements, not duplicates of the same ancesto...

diff --git a/src/traversing.js b/src/traversing.js
index fde7219bbe3925e86a4ec1331fbbf67e1fe159fd..583726b106524123492910b0131e26788c707094 100644 (file)
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -53,9 +53,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];
@@ -80,13 +81,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;
@@ -95,6 +95,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 179e130ba601e219315dce3f076f7b82be5da563..b88b747775c1548621e9657cc5f98baf06092e19 100644 (file)
--- 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() {