X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ftraversing.js;h=a09ae19377348ad808283a85a6d78e5ffb9fd795;hb=21e15219be8e04b3fe25d05a65abfaef96830b9f;hp=d6947ace64400cba82b86f8c28af3a787ad53344;hpb=4e27f17007c2329e31b449e61bb31197b90a37f1;p=jquery.git

diff --git a/src/traversing.js b/src/traversing.js
index d6947ac..a09ae19 100644
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -7,17 +7,17 @@ var runtil = /Until$/,
 // Implement the identical functionality for filter and not
 var winnow = function( elements, qualifier, keep ) {
 	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function(elem, i) {
-			return !!qualifier.call( elem, i ) === keep;
+		return jQuery.grep(elements, function( elem, i ) {
+			return !!qualifier.call( elem, i, elem ) === keep;
 		});
 
 	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function(elem, i) {
+		return jQuery.grep(elements, function( elem, i ) {
 			return (elem === qualifier) === keep;
 		});
 
 	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function(elem) {
+		var filtered = jQuery.grep(elements, function( elem ) {
 			return elem.nodeType === 1;
 		});
 
@@ -28,7 +28,7 @@ var winnow = function( elements, qualifier, keep ) {
 		}
 	}
 
-	return jQuery.grep(elements, function(elem, i) {
+	return jQuery.grep(elements, function( elem, i ) {
 		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
 	});
 };
@@ -68,10 +68,6 @@ jQuery.fn.extend({
 		});
 	},
 
-	contains: function( target ) {
-		return this.has( target ).length > 0;
-	},
-
 	not: function( selector ) {
 		return this.pushStack( winnow(this, selector, false), "not", selector);
 	},
@@ -79,6 +75,10 @@ jQuery.fn.extend({
 	filter: function( selector ) {
 		return this.pushStack( winnow(this, selector, true), "filter", selector );
 	},
+	
+	is: function( selector ) {
+		return !!selector && jQuery.filter( selector, this ).length > 0;
+	},
 
 	closest: function( selectors, context ) {
 		if ( jQuery.isArray( selectors ) ) {
@@ -114,7 +114,7 @@ jQuery.fn.extend({
 		var pos = jQuery.expr.match.POS.test( selectors ) ? 
 			jQuery( selectors, context || this.context ) : null;
 
-		return this.map(function(i, cur){
+		return this.map(function( i, cur ) {
 			while ( cur && cur.ownerDocument && cur !== context ) {
 				if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
 					return cur;
@@ -124,6 +124,21 @@ jQuery.fn.extend({
 			return null;
 		});
 	},
+	
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+		if ( !elem || typeof elem === "string" ) {
+			return jQuery.inArray( this[0],
+				// If it receives a string, the selector is used
+				// If it receives nothing, the siblings are used
+				elem ? jQuery( elem ) : this.parent().children() );
+		}
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
 
 	add: function( selector, context ) {
 		var set = typeof selector === "string" ?
@@ -136,54 +151,52 @@ jQuery.fn.extend({
 			all );
 	},
 
-	eq: function( i ) {
-		return i === -1 ?
-			this.slice( i ) :
-			this.slice( i, +i + 1 );
-	},
+	andSelf: function() {
+		return this.add( this.prevObject );
+	}
+});
 
-	first: function() {
-		return this.eq( 0 );
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
 	},
-
-	last: function() {
-		return this.eq( -1 );
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
 	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ),
-			"slice", slice.call(arguments).join(",") );
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
 	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function(elem, i){
-			return callback.call( elem, i, elem );
-		}));
+	next: function( elem ) {
+		return jQuery.nth( elem, 2, "nextSibling" );
 	},
-
-	andSelf: function() {
-		return this.add( this.prevObject );
+	prev: function( elem ) {
+		return jQuery.nth( elem, 2, "previousSibling" );
 	},
-
-	end: function() {
-		return this.prevObject || jQuery(null);
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( elem.parentNode.firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.makeArray( elem.childNodes );
 	}
-});
-
-jQuery.each({
-	parent: function(elem){return elem.parentNode;},
-	parents: function(elem){return jQuery.dir(elem,"parentNode");},
-	parentsUntil: function(elem,i,until){return jQuery.dir(elem,"parentNode",until);},
-	next: function(elem){return jQuery.nth(elem,2,"nextSibling");},
-	prev: function(elem){return jQuery.nth(elem,2,"previousSibling");},
-	nextAll: function(elem){return jQuery.dir(elem,"nextSibling");},
-	prevAll: function(elem){return jQuery.dir(elem,"previousSibling");},
-	nextUntil: function(elem,i,until){return jQuery.dir(elem,"nextSibling",until);},
-	prevUntil: function(elem,i,until){return jQuery.dir(elem,"previousSibling",until);},
-	siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},
-	children: function(elem){return jQuery.sibling(elem.firstChild);},
-	contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}
-}, function(name, fn){
+}, function( name, fn ) {
 	jQuery.fn[ name ] = function( until, selector ) {
 		var ret = jQuery.map( this, fn, until );