Changeset 1896

Timestamp:

05/13/07 17:20:03 (2 years ago)

Author:

brandon.aaron

Message:

Fix for #1169

Location:

trunk/jquery

Files:

• build/test/index.html (modified) (1 diff)
• src/selector/selector.js (modified) (1 diff)
• src/selector/selectorTest.js (modified) (5 diffs)

trunk/jquery/build/test/index.html

@@ -93 +93 @@
         <form id="lengthtest">
             <input type="text" id="length" name="test">
+            <input type="text" id="idTest" name="id">
         </form>
         <table id="table"></table>

trunk/jquery/src/selector/selector.js

@@ -230 +230 @@
                         // 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];
 

trunk/jquery/src/selector/selectorTest.js

@@ -28 +28 @@
 
 test("id", function() {
-    expect(23);
+    expect(24);
     t( "ID Selector", "#body", ["body"] );
     t( "ID Selector w/ Element", "body#body", ["body"] );
@@ -56 +56 @@
     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
@@ -111 +112 @@
     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"] );
 });
 
@@ -151 +152 @@
     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"] );
@@ -169 +170 @@
     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"] );