X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fselector.js;h=b272acd4fe771294ab1eeac731254157e190951e;hb=66fbbec3bb2d0555da55eea4abae0081484d37b4;hp=33017aa60af1c7d96fd4d5aeedaa034a4c85e5d2;hpb=b4e23b5af0820a66c2e275051f613f3df9a4444d;p=jquery.git

diff --git a/src/selector.js b/src/selector.js
index 33017aa..b272acd 100644
--- a/src/selector.js
+++ b/src/selector.js
@@ -31,7 +31,7 @@ jQuery.extend({
 			empty: "!a.firstChild",
 
 			// Text Check
-			contains: "(a.textContent||a.innerText||'').indexOf(m[3])>=0",
+			contains: "(a.textContent||a.innerText||jQuery(a).text()||'').indexOf(m[3])>=0",
 
 			// Visibility
 			visible: '"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden"',
@@ -140,17 +140,19 @@ jQuery.extend({
 				if ( (m = re.exec(t)) != null ) {
 					r = [];
 
-					var nodeName = m[2], mergeNum = jQuery.mergeNum++;
+					var nodeName = m[2], merge = {};
 					m = m[1];
 
 					for ( var j = 0, rl = ret.length; j < rl; j++ ) {
 						var n = m == "~" || m == "+" ? ret[j].nextSibling : ret[j].firstChild;
 						for ( ; n; n = n.nextSibling )
 							if ( n.nodeType == 1 ) {
-								if ( m == "~" && n.mergeNum == mergeNum ) break;
+								var id = jQuery.data(n);
+
+								if ( m == "~" && merge[id] ) break;
 								
 								if (!nodeName || n.nodeName.toUpperCase() == nodeName.toUpperCase() ) {
-									if ( m == "~" ) n.mergeNum = mergeNum;
+									if ( m == "~" ) merge[id] = true;
 									r.push( n );
 								}
 								
@@ -190,7 +192,7 @@ jQuery.extend({
 					
 					// Re-organize the results, so that they're consistent
 					if ( m ) {
-					   m = [ 0, m[2], m[3], m[1] ];
+						m = [ 0, m[2], m[3], m[1] ];
 
 					} else {
 						// Otherwise, do a traditional filter check for
@@ -295,7 +297,7 @@ jQuery.extend({
 		var last;
 
 		// Look for common filter expressions
-		while ( t  && t != last ) {
+		while ( t && t != last ) {
 			last = t;
 
 			var p = jQuery.parse, m;
@@ -346,31 +348,34 @@ jQuery.extend({
 
 			// We can get a speed boost by handling nth-child here
 			} else if ( m[1] == ":" && m[2] == "nth-child" ) {
-				var num = jQuery.mergeNum++, tmp = [],
-					test = /(\d*)n\+?(\d*)/.exec(
+				var merge = {}, tmp = [],
+					// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+					test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
 						m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" ||
-						!/\D/.test(m[3]) && "n+" + m[3] || m[3]),
-					first = (test[1] || 1) - 0, last = test[2] - 0;
-
+						!/\D/.test(m[3]) && "0n+" + m[3] || m[3]),
+					// calculate the numbers (first)n+(last) including if they are negative
+					first = (test[1] + (test[2] || 1)) - 0, last = test[3] - 0;
+ 
+				// loop through all the elements left in the jQuery object
 				for ( var i = 0, rl = r.length; i < rl; i++ ) {
-					var node = r[i], parentNode = node.parentNode;
+					var node = r[i], parentNode = node.parentNode, id = jQuery.data(parentNode);
 
-					if ( num != parentNode.mergeNum ) {
+					if ( !merge[id] ) {
 						var c = 1;
 
 						for ( var n = parentNode.firstChild; n; n = n.nextSibling )
 							if ( n.nodeType == 1 )
 								n.nodeIndex = c++;
 
-						parentNode.mergeNum = num;
+						merge[id] = true;
 					}
 
 					var add = false;
 
-					if ( first == 1 ) {
-						if ( last == 0 || node.nodeIndex == last )
+					if ( first == 0 ) {
+						if ( node.nodeIndex == last )
 							add = true;
-					} else if ( (node.nodeIndex + last) % first == 0 )
+					} else if ( (node.nodeIndex - last) % first == 0 && (node.nodeIndex - last) / first >= 0 )
 						add = true;
 
 					if ( add ^ not )
@@ -398,12 +403,13 @@ jQuery.extend({
 		return { r: r, t: t };
 	},
 
-	parents: function( elem ){
+	dir: function( elem, dir ){
 		var matched = [];
-		var cur = elem.parentNode;
+		var cur = elem[dir];
 		while ( cur && cur != document ) {
-			matched.push( cur );
-			cur = cur.parentNode;
+			if ( cur.nodeType == 1 )
+				matched.push( cur );
+			cur = cur[dir];
 		}
 		return matched;
 	},