X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fselector%2Fselector.js;h=856e0f594af2f10fb52e265d0f9a886198012a9a;hb=fde2867fce7b592096ae529ab5dcd0842e52f2ac;hp=6af540ec972bc2d34584061e410bd3253f0391a7;hpb=31d65e905237376161b8309411296c6ee72ee100;p=jquery.git

diff --git a/src/selector/selector.js b/src/selector/selector.js
index 6af540e..856e0f5 100644
--- a/src/selector/selector.js
+++ b/src/selector/selector.js
@@ -1,6 +1,6 @@
 jQuery.extend({
 	expr: {
-		"": "m[2]=='*'||a.nodeName.toUpperCase()==m[2].toUpperCase()",
+		"": "m[2]=='*'||jQuery.nodeName(a,m[2])",
 		"#": "a.getAttribute('id')==m[2]",
 		":": {
 			// Position Checks
@@ -45,7 +45,7 @@ jQuery.extend({
 			submit: "a.type=='submit'",
 			image: "a.type=='image'",
 			reset: "a.type=='reset'",
-			button: 'a.type=="button"||a.nodeName.toUpperCase()=="BUTTON"',
+			button: 'a.type=="button"||jQuery.nodeName(a,"button")',
 			input: "/input|select|textarea|button/i.test(a.nodeName)"
 		},
 		".": "jQuery.className.has(a,m[2])",
@@ -59,7 +59,7 @@ jQuery.extend({
 			_resort: function(m){
 				return ["", m[1], m[3], m[2], m[5]];
 			},
-			_prefix: "z=a[m[3]]||jQuery.attr(a,m[3]);"
+			_prefix: "z=a[m[3]];if(!z||/href|src/.test(m[3]))z=jQuery.attr(a,m[3]);"
 		},
 		"[": "jQuery.find(m[2],a).length"
 	},
@@ -85,7 +85,7 @@ jQuery.extend({
 		/^(\+)/, "jQuery.nth(a,2,'nextSibling')",
 		/^(~)/, function(a){
 			var s = jQuery.sibling(a.parentNode.firstChild);
-			return s.slice(0, jQuery.inArray(a,s));
+			return s.slice(jQuery.inArray(a,s) + 1);
 		}
 	],
 
@@ -126,7 +126,7 @@ jQuery.extend({
 			t = t.substr(2,t.length);
 
 		// And the / root expression
-		} else if ( !t.indexOf("/") ) {
+		} else if ( !t.indexOf("/") && !context.ownerDocument ) {
 			context = context.documentElement;
 			t = t.substr(1,t.length);
 			if ( t.indexOf("/") >= 1 )
@@ -155,14 +155,14 @@ jQuery.extend({
 				// Perform our own iteration and filter
 				jQuery.each( ret, function(){
 					for ( var c = this.firstChild; c; c = c.nextSibling )
-						if ( c.nodeType == 1 && ( c.nodeName.toUpperCase() == m[1].toUpperCase() || m[1] == "*" ) )
+						if ( c.nodeType == 1 && ( jQuery.nodeName(c, m[1]) || m[1] == "*" ) )
 							r.push( c );
 				});
 
 				ret = r;
 				t = t.replace( re, "" );
-				if ( foundToken = t.indexOf(" ") == 0 )
-					continue;
+				if ( t.indexOf(" ") == 0 ) continue;
+				foundToken = true;
 			} else {
 				// Look for pre-defined expression tokens
 				for ( var i = 0; i < jQuery.token.length; i += 2 ) {
@@ -219,15 +219,21 @@ jQuery.extend({
 						m = re2.exec(t);
 					}
 
+					var last = ret[ret.length-1];
+
 					// Try to do a global search by ID, where we can
-					if ( m[1] == "#" && ret[ret.length-1].getElementById ) {
+					if ( m[1] == "#" && last && last.getElementById ) {
 						// Optimization for HTML document case
-						var oid = ret[ret.length-1].getElementById(m[2]);
+						var oid = last.getElementById(m[2]);
+						
+						// 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] )
+							oid = jQuery('[@id="'+m[2]+'"]', last)[0];
 
 						// Do a quick check for node name (where applicable) so
 						// that div#foo searches will be really fast
-						ret = r = oid && 
-						  (!m[3] || oid.nodeName.toUpperCase() == m[3].toUpperCase()) ? [oid] : [];
+						ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
 
 					} else {
 						// Pre-compile a regular expression to handle class searches
@@ -242,7 +248,7 @@ jQuery.extend({
 							var tag = m[1] != "" || m[0] == "" ? "*" : m[2];
 
 							// Handle IE7 being really dumb about <object>s
-							if ( this.nodeName.toUpperCase() == "OBJECT" && tag == "*" )
+							if ( jQuery.nodeName(this, "object") && tag == "*" )
 								tag = "param";
 
 							jQuery.merge( r,