X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ftraversing.js;h=f7dde44ec466d9e8d198f6bbbf86af09a4605e89;hb=8c41325a081f4009aa94748b9b6045e50a78422e;hp=59110b096240a42a9646074215f6f07d7f48f347;hpb=e63fa8beb8e285fe19fc0a1557045b80e3c63c66;p=jquery.git diff --git a/src/traversing.js b/src/traversing.js index 59110b0..f7dde44 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