From: Brandon Aaron <brandon.aaron@gmail.com>
Date: Sun, 13 May 2007 17:20:03 +0000 (+0000)
Subject: Fix for #1169
X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=7c6100f5ed840b49e8e0de1f9eb90ea2ef1c47ef

Fix for #1169
---

diff --git a/build/test/index.html b/build/test/index.html
index eb7f7d9..992b79d 100644
--- a/build/test/index.html
+++ b/build/test/index.html
@@ -92,6 +92,7 @@
 		<iframe id="iframe" name="iframe"></iframe>
 		<form id="lengthtest">
 			<input type="text" id="length" name="test">
+			<input type="text" id="idTest" name="id">
 		</form>
 		<table id="table"></table>
 	</div>
diff --git a/src/selector/selector.js b/src/selector/selector.js
index 863148a..6ad8e5c 100644
--- a/src/selector/selector.js
+++ b/src/selector/selector.js
@@ -229,7 +229,8 @@ 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||jQuery.browser.opera) && oid && oid.id != m[2] )
+						// also check to insure id is a string to avoid selecting an element with the name of 'id' inside a form
+						if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && typeof oid.id == "string" && oid.id != m[2] )
 							oid = jQuery('[@id="'+m[2]+'"]', elem)[0];
 
 						// Do a quick check for node name (where applicable) so
diff --git a/src/selector/selectorTest.js b/src/selector/selectorTest.js
index 2cd7db0..0bf90e1 100644
--- a/src/selector/selectorTest.js
+++ b/src/selector/selectorTest.js
@@ -27,7 +27,7 @@ test("broken", function() {
 });
 
 test("id", function() {
-	expect(23);
+	expect(24);
 	t( "ID Selector", "#body", ["body"] );
 	t( "ID Selector w/ Element", "body#body", ["body"] );
 	t( "ID Selector w/ Element", "ul#first", [] );
@@ -55,6 +55,7 @@ test("id", function() {
 	$('<a name="tName1">tName1 A</a><a name="tName2">tName2 A</a><div id="tName1">tName1 Div</div>').appendTo('#main');
 	ok( $("#tName1")[0].id == 'tName1', "ID selector with same value for a name attribute" );
 	ok( $("#tName2").length == 0, "ID selector non-existing but name attribute on an A tag" );
+	t( "ID Selector on Form with an input that has a name of 'id'", "#lengthtest", ["lengthtest"] );
 	
 	t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986
 });
@@ -110,8 +111,8 @@ test("child and adjacent", function() {
 	
 	t( "Last Child", "p:last-child", ["sap"] );
 	
-	t( "Nth-child", "#main form > *:nth-child(2)", ["text2"] );
-	t( "Nth-child", "#main form > :nth-child(2)", ["text2"] );
+	t( "Nth-child", "#main form > *:nth-child(2)", ["text2","idTest"] );
+	t( "Nth-child", "#main form > :nth-child(2)", ["text2","idTest"] );
 });
 
 test("attributes", function() {
@@ -150,7 +151,7 @@ test("pseudo (:) selectors", function() {
 	t( "Last Child", "p:last-child", ["sap"] );
 	t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2"] );
 	t( "Empty", "ul:empty", ["firstUL"] );
-	t( "Enabled UI Element", "input:enabled", ["text1","radio1","radio2","check1","check2","hidden1","hidden2","name","length"] );
+	t( "Enabled UI Element", "input:enabled", ["text1","radio1","radio2","check1","check2","hidden1","hidden2","name","length","idTest"] );
 	t( "Disabled UI Element", "input:disabled", ["text2"] );
 	t( "Checked UI Element", "input:checked", ["radio2","check1"] );
 	t( "Selected Option Element", "option:selected", ["option1a","option2d","option3b","option3c"] );
@@ -168,13 +169,13 @@ test("pseudo (:) selectors", function() {
 	t( "Position Greater Than", "p:gt(0)", ["ap","sndp","en","sap","first"] );
 	t( "Position Less Than", "p:lt(3)", ["firstp","ap","sndp"] );
 	t( "Is A Parent", "p:parent", ["firstp","ap","sndp","en","sap","first"] );
-	t( "Is Visible", "input:visible", ["text1","text2","radio1","radio2","check1","check2","name","length"] );
+	t( "Is Visible", "input:visible", ["text1","text2","radio1","radio2","check1","check2","name","length","idTest"] );
 	t( "Is Hidden", "input:hidden", ["hidden1","hidden2"] );
 	
-	t( "Form element :input", ":input", ["text1", "text2", "radio1", "radio2", "check1", "check2", "hidden1", "hidden2", "name", "button", "area1", "select1", "select2", "select3", "length"] );
+	t( "Form element :input", ":input", ["text1", "text2", "radio1", "radio2", "check1", "check2", "hidden1", "hidden2", "name", "button", "area1", "select1", "select2", "select3", "length", "idTest"] );
 	t( "Form element :radio", ":radio", ["radio1", "radio2"] );
 	t( "Form element :checkbox", ":checkbox", ["check1", "check2"] );
-	t( "Form element :text", ":text", ["text1", "text2", "hidden2", "name", "length"] );
+	t( "Form element :text", ":text", ["text1", "text2", "hidden2", "name", "length", "idTest"] );
 	t( "Form element :radio:checked", ":radio:checked", ["radio2"] );
 	t( "Form element :checkbox:checked", ":checkbox:checked", ["check1"] );
 	t( "Form element :checkbox:checked, :radio:checked", ":checkbox:checked, :radio:checked", ["check1", "radio2"] );