aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradam j. sontag <ajpiano@ajpiano.com>2010-06-21 13:50:02 -0400
committeradam j. sontag <ajpiano@ajpiano.com>2010-06-21 14:18:06 -0400
commita2bd8a53f3a750606abea9bbb6ee2302437d42f3 (patch)
tree531d315f0abfc28d599154088267e3a042fc97f4
parent6a0942c9d5bbcc7eb6b953b8d7191b7bbd1e669f (diff)
downloadjquery-a2bd8a53f3a750606abea9bbb6ee2302437d42f3.tar.gz
jquery-a2bd8a53f3a750606abea9bbb6ee2302437d42f3.zip
.closest() should return a unique set of elements, not duplicates of the same ancestor. Fixes #6700
-rw-r--r--src/traversing.js14
-rw-r--r--test/unit/traversing.js6
2 files changed, 14 insertions, 6 deletions
diff --git a/src/traversing.js b/src/traversing.js
index fde7219bb..583726b10 100644
--- 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 179e130ba..b88b74777 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() {