X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ftraversing.js;h=15446bd8b901f396f2800184964a3cf3858c3380;hb=fb48ae8e6cca25fd29ef2b1eb23e9efa7b0eef7c;hp=c473c75833d4b5e10b6afbe5c66691fb44d6f4f2;hpb=ba149e78a93afa9eab544c7defe3ccf0d412345a;p=jquery.git diff --git a/src/traversing.js b/src/traversing.js index c473c75..15446bd 100644 --- a/src/traversing.js +++ b/src/traversing.js @@ -4,19 +4,14 @@ 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, 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; + var ret = this.pushStack( "", "find", selector ), + length = 0; for ( var i = 0, l = this.length; i < l; i++ ) { length = ret.length; @@ -62,14 +57,15 @@ jQuery.fn.extend({ }, closest: function( selectors, context ) { - var ret; + var ret = [], i, l, cur = this[0]; if ( jQuery.isArray( selectors ) ) { - var cur = this[0], match, matches = {}, selector, level = 1; - ret = []; + var match, selector, + matches = {}, + level = 1; if ( cur && selectors.length ) { - for ( var i = 0, l = selectors.length; i < l; i++ ) { + for ( i = 0, l = selectors.length; i < l; i++ ) { selector = selectors[i]; if ( !matches[selector] ) { @@ -99,10 +95,8 @@ jQuery.fn.extend({ var pos = POS.test( selectors ) ? jQuery( selectors, context || this.context ) : null; - ret = []; - - for ( var i = 0, j = this.length; i < j; i++ ) { - var cur = this[i]; + for ( i = 0, l = this.length; i < l; i++ ) { + cur = this[i]; while ( cur ) { if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) { @@ -111,7 +105,7 @@ jQuery.fn.extend({ } else { cur = cur.parentNode; - if ( !cur.ownerDocument || cur === context ) { + if ( !cur || !cur.ownerDocument || cur === context ) { break; } } @@ -234,7 +228,9 @@ jQuery.extend({ }, dir: function( elem, dir, until ) { - var matched = [], cur = elem[dir]; + var matched = [], + cur = elem[ dir ]; + while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { if ( cur.nodeType === 1 ) { matched.push( cur );