Fixed the issue where $("body").find("div#foo") would ignore the specified tag name...

diff --git a/src/selector/selector.js b/src/selector/selector.js
index b15ee7c..5fc3e0e 100644 (file)
--- a/src/selector/selector.js
+++ b/src/selector/selector.js
@@ -247,7 +247,7 @@ jQuery.extend({
                                                // We need to find all descendant elements
                                                for ( var i = 0; ret[i]; i++ ) {
                                                        // Grab the tag name being searched for
-                                                       var tag = m[1] != "" || m[0] == "" ? "*" : m[2];
+                                                       var tag = m[1] == "#" && m[3] ? m[3] : m[1] != "" || m[0] == "" ? "*" : m[2];
 
                                                        // Handle IE7 being really dumb about <object>s
                                                        if ( tag == "*" && ret[i].nodeName.toLowerCase() == "object" )

diff --git a/src/selector/selectorTest.js b/src/selector/selectorTest.js
index 7a4789a..458804b 100644 (file)
--- a/src/selector/selectorTest.js
+++ b/src/selector/selectorTest.js
@@ -41,7 +41,7 @@ test("broken", function() {
 });
 
 test("id", function() {
-       expect(24);
+       expect(25);
        t( "ID Selector", "#body", ["body"] );
        t( "ID Selector w/ Element", "body#body", ["body"] );
        t( "ID Selector w/ Element", "ul#first", [] );
@@ -72,6 +72,8 @@ test("id", function() {
        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
+
+       isSet( $("body").find("div#form"), [], "ID selector within the context of another element" );
 });
 
 test("class", function() {