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

diff --git a/src/selector/selector.js b/src/selector/selector.js
index b754d42..48c6e15 100644
--- a/src/selector/selector.js
+++ b/src/selector/selector.js
@@ -76,7 +76,8 @@ jQuery.extend({
 		/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
 
 		// Match: :even, :last-chlid, #id, .class
-		/^([:.#]*)((?:[\w\u0128-\uFFFF*-]|\\.)+)/
+		new RegExp("^([:.#]*)(" + 
+			( jQuery.chars = "(?:[\\w\u0128-\uFFFF*-]|\\\\.)" ) + "+)")
 	],
 
 	token: [
@@ -153,11 +154,10 @@ jQuery.extend({
 
 			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, "" );
@@ -165,7 +165,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];
@@ -204,7 +204,7 @@ jQuery.extend({
 
 				} else {
 					// Optomize for the case nodeName#idName
-					var re2 = /^(\w+)(#)((?:[\w\u0128-\uFFFF*-]|\\.)+)/;
+					var re2 = new RegExp("^(\\w+)(#)(" + jQuery.chars + "+)");
 					var m = re2.exec(t);
 					
 					// Re-organize the results, so that they're consistent
@@ -214,7 +214,7 @@ jQuery.extend({
 					} else {
 						// Otherwise, do a traditional filter check for
 						// ID, class, and element selectors
-						re2 = /^([#.]?)((?:[\w\u0128-\uFFFF*-]|\\.)*)/;
+						re2 = new RegExp("^([#.]?)(" + jQuery.chars + "*)");
 						m = re2.exec(t);
 					}
 
@@ -229,18 +229,15 @@ jQuery.extend({
 						
 						// Do a quick check for the existence of the actual ID attribute
 						// to avoid selecting by the name attribute in IE
-						if ( jQuery.browser.msie && oid && oid.id != m[2] )
+						if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && oid.id != m[2] )
 							oid = jQuery('[@id="'+m[2]+'"]', elem)[0];
 
 						// 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, it is more
-						// efficient to use getAll() when we are already further down
-						// the tree - we try to recognize that here
-						for ( var i = 0, rl = ret.length; i < rl; i++ ) {
+						// We need to find all descendant elements
+						for ( var i = 0; ret[i]; i++ ) {
 							// Grab the tag name being searched for
 							var tag = m[1] != "" || m[0] == "" ? "*" : m[2];
 
@@ -253,23 +250,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;
@@ -304,6 +298,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;
 
@@ -313,11 +318,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
@@ -329,18 +331,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]];