X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ftraversing.js;h=8f1e5eb5017b76dbdb6379b79be5eb8cd516b7e0;hb=4b5a680f776ee2582e2c1f85b7b0cd9a95254dc3;hp=f46820f849d913a3fe95942eb58c52d31d5d1ca8;hpb=d6991fa273515a8503692324499edcc71b5c3f64;p=jquery.git diff --git a/src/traversing.js b/src/traversing.js index f46820f..8f1e5eb 100644 --- a/src/traversing.js +++ b/src/traversing.js @@ -1,4 +1,4 @@ -jQuery.winnow = function( elements, qualifier, keep ) { +var winnow = function( elements, qualifier, keep ) { if(jQuery.isFunction( qualifier )) { return jQuery.grep(elements, function(elem, i) { return !!qualifier.call( elem, i ) === keep; @@ -44,11 +44,11 @@ jQuery.fn.extend({ }, not: function( selector ) { - return this.pushStack( jQuery.winnow(this, selector, false), "not", selector); + return this.pushStack( winnow(this, selector, false), "not", selector); }, filter: function( selector ) { - return this.pushStack( jQuery.winnow(this, selector, true), "filter", selector ); + return this.pushStack( winnow(this, selector, true), "filter", selector ); }, closest: function( selector, context ) { @@ -69,16 +69,28 @@ jQuery.fn.extend({ }, add: function( selector ) { - return this.pushStack( jQuery.unique( jQuery.merge( - this.get(), - typeof selector === "string" ? + var set = typeof selector === "string" ? jQuery( selector ) : - jQuery.makeArray( selector ) - ))); + jQuery.makeArray( selector ), + all = jQuery.merge( this.get(), set ); + + return this.pushStack( set[0] && (set[0].setInterval || set[0].nodeType === 9 || (set[0].parentNode && set[0].parentNode.nodeType !== 11)) ? + jQuery.unique( all ) : + all ); }, eq: function( i ) { - return this.slice( i, +i + 1 ); + return i === -1 ? + this.slice( i ) : + this.slice( i, +i + 1 ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); }, slice: function() { @@ -115,9 +127,16 @@ jQuery.each({ jQuery.fn[ name ] = function( selector ) { var ret = jQuery.map( this, fn ); - if ( selector && typeof selector == "string" ) + if ( selector && typeof selector === "string" ) { ret = jQuery.multiFilter( selector, ret ); + } + + ret = this.length > 1 ? jQuery.unique( ret ) : ret; + + if ( name === "parents" && this.length > 1 ) { + ret = ret.reverse(); + } - return this.pushStack( jQuery.unique( ret ), name, selector ); + return this.pushStack( ret, name, selector ); }; });