X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=src%2Ftraversing.js;h=c473c75833d4b5e10b6afbe5c66691fb44d6f4f2;hp=df431781a0b7189d76b6a9eb3b18c92d7b5737d5;hb=ba149e78a93afa9eab544c7defe3ccf0d412345a;hpb=eb67d9941694d39a592228bc6da71def3e619b94 diff --git a/src/traversing.js b/src/traversing.js index df43178..c473c75 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 ) { @@ -100,13 +99,13 @@ jQuery.fn.extend({ var pos = POS.test( selectors ) ? jQuery( selectors, context || this.context ) : null; - var ret = []; + ret = []; for ( var i = 0, j = this.length; i < j; i++ ) { var 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; @@ -229,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 ) {