X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fselector%2Fselector.js;h=856e0f594af2f10fb52e265d0f9a886198012a9a;hb=fde2867fce7b592096ae529ab5dcd0842e52f2ac;hp=7596acdb9fce3da7cd3e942b32f0c2fdc803c472;hpb=8e105ef9318da2a38019878c6152a4a67d9fceb1;p=jquery.git

diff --git a/src/selector/selector.js b/src/selector/selector.js
index 7596acd..856e0f5 100644
--- a/src/selector/selector.js
+++ b/src/selector/selector.js
@@ -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 )
@@ -161,8 +161,8 @@ jQuery.extend({
 
 				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] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
+						ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
 
 					} else {
 						// Pre-compile a regular expression to handle class searches