X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fselector%2Fselector.js;h=be50d332f2e547a8200c4f88ac92b679d068ab35;hb=fce2bdf7ff1d5a293690c65de36a7824a50bc54f;hp=d7fe9065a0ab6a694dd6d30111d888615e222100;hpb=3446c3af764c4d91f3676b214575168b82205e83;p=jquery.git

diff --git a/src/selector/selector.js b/src/selector/selector.js
index d7fe906..be50d33 100644
--- a/src/selector/selector.js
+++ b/src/selector/selector.js
@@ -56,6 +56,9 @@ jQuery.extend({
 			"$=": "z&&z.substr(z.length - m[4].length,m[4].length)==m[4]",
 			"*=": "z&&z.indexOf(m[4])>=0",
 			"": "z",
+			// these are for evaling in a regexp.
+			"=~": "eval(m[4]).test(z)",
+			"!~": "!eval(m[4]).test(z)",
 			_resort: function(m){
 				return ["", m[1], m[3], m[2], m[5]];
 			},
@@ -67,7 +70,7 @@ jQuery.extend({
 	// The regular expressions that power the parsing engine
 	parse: [
 		// Match: [@value='test'], [@foo]
-		/^\[ *(@)([\w-]+) *([!*$^=]*) *('?"?)(.*?)\4 *\]/,
+		/^\[ *(@)([\w-]+) *([!*$^=!~]*) *('?"?)(.*?)\4 *\]/,
 
 		// Match: [div], [div p]
 		/^(\[)\s*(.*?(\[.*?\])?[^[]*?)\s*\]/,
@@ -77,7 +80,7 @@ jQuery.extend({
 
 		// Match: :even, :last-chlid, #id, .class
 		new RegExp("^([:.#]*)(" + 
-			( jQuery.chars = "(?:[\\w\u0128-\uFFFF*-]|\\\\.)" ) + "+)")
+			( jQuery.chars = "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)" ) + "+)")
 	],
 
 	token: [
@@ -149,16 +152,15 @@ jQuery.extend({
 
 			// An attempt at speeding up child selectors that
 			// point to a specific element tag
-			var re = /^[\/>]\s*([\w*-]+)/;
+			var re = new RegExp("^[/>]\\s*(" + jQuery.chars + "+)");
 			var m = re.exec(t);
 
 			if ( m ) {
 				// Perform our own iteration and filter
-				jQuery.each( ret, function(){
-					for ( var c = this.firstChild; c; c = c.nextSibling )
-						if ( c.nodeType == 1 && ( jQuery.nodeName(c, m[1]) || m[1] == "*" ) )
+				for ( var i = 0; ret[i]; i++ )
+					for ( var c = ret[i].firstChild; c; c = c.nextSibling )
+						if ( c.nodeType == 1 && ( m[1] == "*" || jQuery.nodeName(c, m[1]) ) )
 							r.push( c );
-				});
 
 				ret = r;
 				t = t.replace( re, "" );
@@ -166,7 +168,7 @@ jQuery.extend({
 				foundToken = true;
 			} else {
 				// Look for pre-defined expression tokens
-				for ( var i = 0; i < jQuery.token.length; i += 2 ) {
+				for ( var i = 0, tl = jQuery.token.length; i < tl; i += 2 ) {
 					// Attempt to match each, individual, token in
 					// the specified order
 					var re = jQuery.token[i], fn = jQuery.token[i+1];
@@ -205,7 +207,7 @@ jQuery.extend({
 
 				} else {
 					// Optomize for the case nodeName#idName
-					var re2 = new RegExp("^(\\w+)(#)(" + jQuery.chars + "+)");
+					var re2 = new RegExp("^(" + jQuery.chars + "+)(#)(" + jQuery.chars + "+)");
 					var m = re2.exec(t);
 					
 					// Re-organize the results, so that they're consistent
@@ -236,10 +238,9 @@ jQuery.extend({
 						// Do a quick check for node name (where applicable) so
 						// that div#foo searches will be really fast
 						ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
-
 					} else {
 						// We need to find all descendant elements
-						for ( var i = 0, rl = ret.length; i < rl; i++ ) {
+						for ( var i = 0; ret[i]; i++ ) {
 							// Grab the tag name being searched for
 							var tag = m[1] != "" || m[0] == "" ? "*" : m[2];
 
@@ -252,23 +253,20 @@ jQuery.extend({
 
 						// It's faster to filter by class and be done with it
 						if ( m[1] == "." )
-							r = jQuery.grep( r, function(e) {
-								return jQuery.className.has(e, m[2]);
-							});
+							r = jQuery.classFilter( r, m[2] );
 
 						// Same with ID filtering
 						if ( m[1] == "#" ) {
-							// Remember, then wipe out, the result set
-							var tmp = r;
-							r = [];
-
-							// Then try to find the element with the ID
-							jQuery.each( tmp, function(){
-								if ( this.getAttribute("id") == m[2] ) {
-									r = [ this ];
-									return false;
+							var tmp = [];
+
+							// Try to find the element with the ID
+							for ( var i = 0; r[i]; i++ )
+								if ( r[i].getAttribute("id") == m[2] ) {
+									tmp = [ r[i] ];
+									break;
 								}
-							});
+
+							r = tmp;
 						}
 
 						ret = r;
@@ -303,6 +301,17 @@ jQuery.extend({
 		return done;
 	},
 
+	classFilter: function(r,m,not){
+		m = " " + m + " ";
+		var tmp = [];
+		for ( var i = 0; r[i]; i++ ) {
+			var pass = (" " + r[i].className + " ").indexOf( m ) >= 0;
+			if ( !not && pass || not && !pass )
+				tmp.push( r[i] );
+		}
+		return tmp;
+	},
+
 	filter: function(t,r,not) {
 		var last;
 
@@ -312,11 +321,8 @@ jQuery.extend({
 
 			var p = jQuery.parse, m;
 
-			jQuery.each( p, function(i,re){
-		
-				// Look for, and replace, string-like sequences
-				// and finally build a regexp out of it
-				m = re.exec( t );
+			for ( var i = 0; p[i]; i++ ) {
+				m = p[i].exec( t );
 
 				if ( m ) {
 					// Remove what we just matched
@@ -328,18 +334,22 @@ jQuery.extend({
 
 					m[2] = m[2].replace(/\\/g, "");
 
-					return false;
+					break;
 				}
-			});
+			}
 
 			if ( !m )
-				continue;
+				break;
 
 			// :not() is a special case that can be optimized by
 			// keeping it out of the expression list
 			if ( m[1] == ":" && m[2] == "not" )
 				r = jQuery.filter(m[3], r, true).r;
 
+			// We can get a big speed boost by filtering by class here
+			else if ( m[1] == "." )
+				r = jQuery.classFilter(r, m[2], not);
+
 			// Otherwise, find the expression to execute
 			else {
 				var f = jQuery.expr[m[1]];