* Fixed IE ID selectors selecting by the name attribute and added tests

* Added href attribute test to test suite
* Updated Changelog

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 40ec5478b02b23dd0c146e3a2adb5c5e0cb25965..ba4ed5f3319935ffab5ca125a7c9fd663687eea8 100644 (file)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -7,7 +7,9 @@ New and Noteworthy
 1.1.2
 ----
 
+* Fixed IE ID selectors selecting by the name attribute.
 * Change: Events are now internally stored in elem.$events rather than elem.events (due to a nasty bug relating to DOM 0 expandos).
+* .attr('href') is now consistent in all browsers.
 * @href is now consistent in all browsers.
 * Fixed the slideDown flickering bug.
 * Having a \r endline in $("...") caused a never-ending loop.

diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index 497d30dbd4392412591f627fc0770ace6a0ebd7a..25cb69b307a378c287cfc226433865639bd749b3 100644 (file)
--- a/src/jquery/coreTest.js
+++ b/src/jquery/coreTest.js
@@ -74,7 +74,7 @@ test("index(Object)", function() {
 });\r
 \r
 test("attr(String)", function() {\r
-       expect(14);\r
+       expect(15);\r
        ok( $('#text1').attr('value') == "Test", 'Check for value attribute' );\r
        ok( $('#text1').attr('type') == "text", 'Check for type attribute' );\r
        ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' );\r
@@ -87,7 +87,10 @@ test("attr(String)", function() {
        ok( $('#name').attr('name') == "name", 'Check for name attribute' );\r
        ok( $('#text1').attr('name') == "action", 'Check for name attribute' );\r
        ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );\r
-       //equals( "#2", $('#anchor2').attr('href'), 'Check for non-absolute href (an anchor)' ); This fails in IE because the _config.fixture is reloaded using innerHTML\r
+       \r
+       $('<a id="tAnchor5"></a>').attr('href', '#5').appendTo('#main'); // using innerHTML in IE causes href attribute to be serialized to the full path\r
+       ok( $('#tAnchor5').attr('href') == "#5", 'Check for non-absolute href (an anchor)' );\r
+       \r
        stop();\r
        $.get("data/dashboard.xml", function(xml) {\r
                ok( $("locations", xml).attr("class") == "foo", "Check class attribute in XML document" );\r
@@ -242,7 +245,7 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
        \r
        reset();\r
        $("#sap").append(document.getElementById('form'));\r
-       ok( $("#sap>form").size() == 1, "Check for appending a form" );\r
+       ok( $("#sap>form").size() == 1, "Check for appending a form" );  // Bug #910\r
        \r
 });\r
 \r

diff --git a/src/selector/selector.js b/src/selector/selector.js
index a6597f4566e5ed058b930f92ed5b407e16bd103c..e1abbf4f69823790de73b5eb09d6b99f4b106f8b 100644 (file)
--- a/src/selector/selector.js
+++ b/src/selector/selector.js
@@ -223,11 +223,15 @@ jQuery.extend({
                                        if ( m[1] == "#" && ret[ret.length-1].getElementById ) {
                                                // Optimization for HTML document case
                                                var oid = ret[ret.length-1].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]+'"]', ret[ret.length-1])[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

diff --git a/src/selector/selectorTest.js b/src/selector/selectorTest.js
index be216f8bf827eca8917d841170150f1efa6e6faa..c9cf762a57f848d9bc4c0e24295e45e925c12bf4 100644 (file)
--- a/src/selector/selectorTest.js
+++ b/src/selector/selectorTest.js
@@ -11,7 +11,7 @@ test("expressions - element", function() {
 });\r
 \r
 test("expressions - id", function() {\r
-       expect(11);\r
+       expect(13);\r
        t( "ID Selector", "#body", ["body"] );\r
        t( "ID Selector w/ Element", "body#body", ["body"] );\r
        t( "ID Selector w/ Element", "ul#first", [] );\r
@@ -25,7 +25,11 @@ test("expressions - id", function() {
        t( "All Children of ID", "#foo/*", ["sndp", "en", "sap"] );\r
        t( "All Children of ID with no children", "#firstUL/*", [] );\r
        \r
-       t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] );\r
+       $('<a name="tName1">tName1 A</a><a name="tName2">tName2 A</a><div id="tName1">tName1 Div</div>').appendTo('#main');\r
+       ok( $("#tName1")[0].id == 'tName1', "ID selector with same value for a name attribute" );\r
+       ok( $("#tName2").length == 0, "ID selector non-existing but name attribute on an A tag" );\r
+       \r
+       t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986\r
 });\r
 \r
 \r