X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fselector%2Fselector.js;h=b754d421ea86f9ce7212d153670ecab3d279708a;hb=9c7f8ba90ea45a653cf45a6379ccd4943cc22200;hp=9d36ca7077fed146a9e4a0bc126d47ec7f040115;hpb=af79bb1f255433d553d8d9dde0306cc340903c1a;p=jquery.git

diff --git a/src/selector/selector.js b/src/selector/selector.js
index 9d36ca7..b754d42 100644
--- a/src/selector/selector.js
+++ b/src/selector/selector.js
@@ -61,22 +61,22 @@ jQuery.extend({
 			},
 			_prefix: "z=a[m[3]];if(!z||/href|src/.test(m[3]))z=jQuery.attr(a,m[3]);"
 		},
-		"[": "jQuery.find(m[2],a).length"
+		"[": "parseInt(m[2])?jQuery.nth(a.parentNode.firstChild,parseInt(m[2]),'nextSibling',a)==a:jQuery.find(m[2],a).length"
 	},
 	
 	// The regular expressions that power the parsing engine
 	parse: [
 		// Match: [@value='test'], [@foo]
-		/^\[ *(@)([\w-]+) *([!*$^=]*) *('?"?)(.*?)\4 *\]/i,
+		/^\[ *(@)([\w-]+) *([!*$^=]*) *('?"?)(.*?)\4 *\]/,
 
 		// Match: [div], [div p]
 		/^(\[)\s*(.*?(\[.*?\])?[^[]*?)\s*\]/,
 
 		// Match: :contains('foo')
-		/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/i,
+		/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
 
 		// Match: :even, :last-chlid, #id, .class
-		/^([:.#]*)([\w\u0128-\uFFFF*-]+)/i
+		/^([:.#]*)((?:[\w\u0128-\uFFFF*-]|\\.)+)/
 	],
 
 	token: [
@@ -148,7 +148,7 @@ jQuery.extend({
 
 			// An attempt at speeding up child selectors that
 			// point to a specific element tag
-			var re = /^[\/>]\s*([\w*-]+)/i;
+			var re = /^[\/>]\s*([\w*-]+)/;
 			var m = re.exec(t);
 
 			if ( m ) {
@@ -168,15 +168,14 @@ jQuery.extend({
 				for ( var i = 0; i < jQuery.token.length; i += 2 ) {
 					// Attempt to match each, individual, token in
 					// the specified order
-					var re = jQuery.token[i];
+					var re = jQuery.token[i], fn = jQuery.token[i+1];
 					var m = re.exec(t);
 
 					// If the token match was found
 					if ( m ) {
 						// Map it against the token's handler
-						r = ret = jQuery.map( ret, jQuery.isFunction( jQuery.token[i+1] ) ?
-							jQuery.token[i+1] :
-							function(a){ return eval(jQuery.token[i+1]); });
+						r = ret = jQuery.map( ret, jQuery.isFunction( fn ) ?
+							fn : new Function( "a", "return " + fn ) );
 
 						// And remove the token
 						t = jQuery.trim( t.replace( re, "" ) );
@@ -205,7 +204,7 @@ jQuery.extend({
 
 				} else {
 					// Optomize for the case nodeName#idName
-					var re2 = /^(\w+)(#)([\w\u0128-\uFFFF*-]+)/i;
+					var re2 = /^(\w+)(#)((?:[\w\u0128-\uFFFF*-]|\\.)+)/;
 					var m = re2.exec(t);
 					
 					// Re-organize the results, so that they're consistent
@@ -215,10 +214,12 @@ jQuery.extend({
 					} else {
 						// Otherwise, do a traditional filter check for
 						// ID, class, and element selectors
-						re2 = /^([#.]?)([\w\u0128-\uFFFF*-]*)/i;
+						re2 = /^([#.]?)((?:[\w\u0128-\uFFFF*-]|\\.)*)/;
 						m = re2.exec(t);
 					}
 
+					m[2] = m[2].replace(/\\/g, "");
+
 					var elem = ret[ret.length-1];
 
 					// Try to do a global search by ID, where we can
@@ -236,10 +237,6 @@ jQuery.extend({
 						ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
 
 					} else {
-						// Pre-compile a regular expression to handle class searches
-						if ( m[1] == "." )
-							var rec = new RegExp("(^|\\s)" + m[2] + "(\\s|$)");
-
 						// We need to find all descendant elements, it is more
 						// efficient to use getAll() when we are already further down
 						// the tree - we try to recognize that here
@@ -257,7 +254,7 @@ jQuery.extend({
 						// It's faster to filter by class and be done with it
 						if ( m[1] == "." )
 							r = jQuery.grep( r, function(e) {
-								return rec.test(e.className);
+								return jQuery.className.has(e, m[2]);
 							});
 
 						// Same with ID filtering
@@ -330,6 +327,8 @@ jQuery.extend({
 					if ( jQuery.expr[ m[1] ]._resort )
 						m = jQuery.expr[ m[1] ]._resort( m );
 
+					m[2] = m[2].replace(/\\/g, "");
+
 					return false;
 				}
 			});
@@ -342,17 +341,8 @@ jQuery.extend({
 			if ( m[1] == ":" && m[2] == "not" )
 				r = jQuery.filter(m[3], r, true).r;
 
-			// Handle classes as a special case (this will help to
-			// improve the speed, as the regexp will only be compiled once)
-			else if ( m[1] == "." ) {
-
-				var re = new RegExp("(^|\\s)" + m[2] + "(\\s|$)");
-				r = jQuery.grep( r, function(e){
-					return re.test(e.className || "");
-				}, not);
-
 			// Otherwise, find the expression to execute
-			} else {
+			else {
 				var f = jQuery.expr[m[1]];
 				if ( typeof f != "string" )
 					f = jQuery.expr[m[1]][m[2]];