X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ftraversing.js;h=b5a5a2dee176a9fd68bb1f91fb88aba606cb30c8;hb=255068da33e3d131b3a641c041fb8cecb1543fa4;hp=92f58ba9cd51c02c12cfedfb3162fa0a565d5265;hpb=b0fe380cf89564305646bbd55d1fd7bd210fd591;p=jquery.git diff --git a/src/traversing.js b/src/traversing.js index 92f58ba..b5a5a2d 100644 --- a/src/traversing.js +++ b/src/traversing.js @@ -6,18 +6,21 @@ var winnow = function( elements, qualifier, keep ) { } else if( qualifier.nodeType ) { return jQuery.grep(elements, function(elem, i) { return (elem === qualifier) === keep; - }) + }); } else if( typeof qualifier === "string" ) { - var filtered = jQuery.grep(elements, function(elem) { return elem.nodeType === 1 }); + var filtered = jQuery.grep(elements, function(elem) { return elem.nodeType === 1; }); - if(isSimple.test( qualifier )) return jQuery.filter(qualifier, filtered, !keep); - else qualifier = jQuery.filter( qualifier, elements ); + if(isSimple.test( qualifier )) { + return jQuery.filter(qualifier, filtered, !keep); + } else { + qualifier = jQuery.filter( qualifier, elements ); + } } return jQuery.grep(elements, function(elem, i) { return (jQuery.inArray( elem, qualifier ) >= 0) === keep; }); -} +}; jQuery.fn.extend({ find: function( selector ) { @@ -52,19 +55,21 @@ jQuery.fn.extend({ }, closest: function( selector, context ) { - var pos = jQuery.expr.match.POS.test( selector ) ? jQuery(selector) : null, - closer = 0; + var pos = jQuery.expr.match.POS.test( selector ) ? + jQuery( selector, context || this.context ) : null; return this.map(function(){ - var cur = this; + var cur = this, closer = 0; while ( cur && cur.ownerDocument && cur !== context ) { if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) ) { - jQuery.data(cur, "closest", closer); + jQuery.lastCloser = closer; return cur; } cur = cur.parentNode; closer++; } + jQuery.lastCloser = -1; + return null; }); },