X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ftraversing.js;h=f57819d86d399016b71fbebb8fd2dddb7c9c77c7;hb=0229b83f7e5bf64edb2888ab349bedcd1a45e7c1;hp=d485d691a66297c289222b498eba4337b212c021;hpb=8effe3a7dee91c833cc1774646da9d743600c64c;p=jquery.git diff --git a/src/traversing.js b/src/traversing.js index d485d69..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++ ) { @@ -53,8 +61,11 @@ 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++ ) { @@ -75,6 +86,7 @@ jQuery.fn.extend({ ret.push({ selector: selector, elem: cur, level: level }); } } + cur = cur.parentNode; level++; } @@ -86,15 +98,21 @@ jQuery.fn.extend({ 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; } + cur = cur.parentNode; } + return null; }); + + ret = ret.length > 1 ? jQuery.unique(ret) : ret; + + return this.pushStack( ret, "closest", selectors ); }, // Determine the position of an element within @@ -270,4 +288,6 @@ function winnow( elements, qualifier, keep ) { return jQuery.grep(elements, function( elem, i ) { return (jQuery.inArray( elem, qualifier ) >= 0) === keep; }); -}; \ No newline at end of file +} + +})( jQuery );