deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

.closest() should return a unique set of elements, not duplicates of the same ancestor. Fixes #6700

Browse source
This commit is contained in:
adam j. sontag 2010-06-21 13:50:02 -04:00
parent 6a0942c9d5
commit a2bd8a53f3
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/traversing.js
View file

@ -53,9 +53,10 @@ jQuery.fn.extend({
}, },
closest: function( selectors, context ) { closest: function( selectors, context ) {
var ret;
if ( jQuery.isArray( selectors ) ) { 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 ) { if ( cur && selectors.length ) {
for ( var i = 0, l = selectors.length; i < l; i++ ) { for ( var i = 0, l = selectors.length; i < l; i++ ) {
selector = selectors[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 ) ? var pos = jQuery.expr.match.POS.test( selectors ) ?
jQuery( selectors, context || this.context ) : null; jQuery( selectors, context || this.context ) : null;
ret = jQuery.map(this.get(),function( cur,i ) {
return this.map(function( i, cur ) {
while ( cur && cur.ownerDocument && cur !== context ) { while ( cur && cur.ownerDocument && cur !== context ) {
if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) { if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
return cur; return cur;
@ -95,6 +95,10 @@ jQuery.fn.extend({
} }
return null; return null;
}); });
ret = ret.length > 1 ? jQuery.unique(ret) : ret;
return this.pushStack( ret, "closest", selectors );
}, },
// Determine the position of an element within // Determine the position of an element within

6
test/unit/traversing.js
View file

@ -120,7 +120,7 @@ test("filter(jQuery)", function() {
}) })
test("closest()", function() { test("closest()", function() {
expect(9); expect(10);
same( jQuery("body").closest("body").get(), q("body"), "closest(body)" ); same( jQuery("body").closest("body").get(), q("body"), "closest(body)" );
same( jQuery("body").closest("html").get(), q("html"), "closest(html)" ); same( jQuery("body").closest("html").get(), q("html"), "closest(html)" );
same( jQuery("body").closest("div").get(), [], "closest(div)" ); 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("html", document.body).get(), [], "Context limited." );
same( jq.closest("body", 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." ); 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() { test("closest(Array)", function() {