X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftraversing.js;h=5a479f2efc47825670905bbbfaaa4c7af3b2d130;hb=385ca2aa899d2ed953d9e18c95387e72e330b42c;hp=df431781a0b7189d76b6a9eb3b18c92d7b5737d5;hpb=eb67d9941694d39a592228bc6da71def3e619b94;p=jquery.git diff --git a/src/traversing.js b/src/traversing.js index df43178..5a479f2 100644 --- a/src/traversing.js +++ b/src/traversing.js @@ -6,9 +6,8 @@ var runtil = /Until$/, rmultiselector = /,/, rchild = /^\s*>/, isSimple = /^.[^:#\[\.,]*$/, - slice = Array.prototype.slice; - -var POS = jQuery.expr.match.POS; + slice = Array.prototype.slice, + POS = jQuery.expr.match.POS; jQuery.fn.extend({ find: function( selector ) { @@ -63,14 +62,13 @@ 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, matches = {}, selector, 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] ) { @@ -100,19 +98,17 @@ jQuery.fn.extend({ var pos = POS.test( selectors ) ? jQuery( selectors, context || this.context ) : null; - var 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.matches(selectors, 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 ) { + if ( !cur || !cur.ownerDocument || cur === context ) { break; } } @@ -229,7 +225,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 ) {