X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ftraversing.js;h=c473c75833d4b5e10b6afbe5c66691fb44d6f4f2;hb=ba149e78a93afa9eab544c7defe3ccf0d412345a;hp=dff10875462c803779a026fbd286575d982a01df;hpb=7be11207b9267592a639eb739dc8d719c7de56a1;p=jquery.git diff --git a/src/traversing.js b/src/traversing.js index dff1087..c473c75 100644 --- a/src/traversing.js +++ b/src/traversing.js @@ -4,11 +4,18 @@ 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; + slice = Array.prototype.slice, + POS = jQuery.expr.match.POS; 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++ ) { @@ -89,21 +96,28 @@ jQuery.fn.extend({ return ret; } - var pos = jQuery.expr.match.POS.test( selectors ) ? + var pos = 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; - } + ret = []; - cur = cur.parentNode; + for ( var i = 0, j = this.length; i < j; i++ ) { + var cur = this[i]; + + while ( cur ) { + if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) { + ret.push( cur ); + break; + + } else { + cur = cur.parentNode; + if ( !cur.ownerDocument || cur === context ) { + break; + } + } } + } - return null; - }); - ret = ret.length > 1 ? jQuery.unique(ret) : ret; return this.pushStack( ret, "closest", selectors ); @@ -214,7 +228,9 @@ jQuery.extend({ expr = ":not(" + expr + ")"; } - return jQuery.find.matches(expr, elems); + return elems.length === 1 ? + jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] : + jQuery.find.matches(expr, elems); }, dir: function( elem, dir, until ) {