X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftraversing.js;h=f57819d86d399016b71fbebb8fd2dddb7c9c77c7;hb=0cdcef5b364fa3c89d7f27935e77b453f4a56efd;hp=583726b106524123492910b0131e26788c707094;hpb=a2bd8a53f3a750606abea9bbb6ee2302437d42f3;p=jquery.git diff --git a/src/traversing.js b/src/traversing.js index 583726b..f57819d 100644 --- a/src/traversing.js +++ b/src/traversing.js @@ -1,12 +1,20 @@ +(function( jQuery ) { + var runtil = /Until$/, rparentsprev = /^(?:parents|prevUntil|prevAll)/, // Note: This RegExp should be improved, or likely pulled from Sizzle rmultiselector = /,/, + rchild = /^\s*>/, isSimple = /^.[^:#\[\.,]*$/, slice = Array.prototype.slice; jQuery.fn.extend({ find: function( selector ) { + // Handle "> div" child selectors and pass them to .children() + if ( typeof selector === "string" && rchild.test( selector ) ) { + return this.children( selector.replace( rchild, "" ) ); + } + var ret = this.pushStack( "", "find", selector ), length = 0; for ( var i = 0, l = this.length; i < l; i++ ) { @@ -54,9 +62,11 @@ jQuery.fn.extend({ closest: function( selectors, context ) { var ret; + if ( jQuery.isArray( selectors ) ) { 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]; @@ -76,23 +86,27 @@ jQuery.fn.extend({ ret.push({ selector: selector, elem: cur, level: level }); } } + cur = cur.parentNode; level++; } } - return ret.length > 1 ? jQuery.unique(ret) : ret; + return ret; } var pos = jQuery.expr.match.POS.test( selectors ) ? jQuery( selectors, context || this.context ) : null; + 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; } + cur = cur.parentNode; } + return null; }); @@ -275,3 +289,5 @@ function winnow( elements, qualifier, keep ) { return (jQuery.inArray( elem, qualifier ) >= 0) === keep; }); } + +})( jQuery );