X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ftraversing.js;h=583726b106524123492910b0131e26788c707094;hb=a2bd8a53f3a750606abea9bbb6ee2302437d42f3;hp=fde7219bbe3925e86a4ec1331fbbf67e1fe159fd;hpb=6a0942c9d5bbcc7eb6b953b8d7191b7bbd1e669f;p=jquery.git diff --git a/src/traversing.js b/src/traversing.js index fde7219..583726b 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