Skip to content
Permalink
Browse files

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

…to ajpiano-closestbug-6700
  • Loading branch information
jeresig committed Sep 27, 2010
2 parents e63fa8b + a2bd8a5 commit 8c41325a081f4009aa94748b9b6045e50a78422e
Showing with 14 additions and 6 deletions.
  1. +9 −5 src/traversing.js
  2. +5 −1 test/unit/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
@@ -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() {

0 comments on commit 8c41325

Please sign in to comment.
You can’t perform that action at this time.