From: John Resig Date: Sat, 7 Feb 2009 16:54:11 +0000 (+0000) Subject: Added logic for not using getElementsByClassName in different failure states. Fixes... X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=2b7642cff025be3b8ac019ae77f2f19ecd07fa87;p=jquery.git Added logic for not using getElementsByClassName in different failure states. Fixes jQuery bugs #4058 and #4042. --- diff --git a/src/selector.js b/src/selector.js index 5425d94..9fb674e 100644 --- a/src/selector.js +++ b/src/selector.js @@ -741,12 +741,25 @@ if ( document.querySelectorAll ) (function(){ Sizzle.matches = oldSizzle.matches; })(); -if ( document.getElementsByClassName && document.documentElement.getElementsByClassName ) { +if ( document.getElementsByClassName && document.documentElement.getElementsByClassName ) (function(){ + var div = document.createElement("div"); + div.innerHTML = "
"; + + // Opera can't find a second classname (in 9.6) + if ( div.getElementsByClassName("e").length === 0 ) + return; + + // Safari caches class attributes, doesn't catch changes (in 3.2) + div.lastChild.className = "e"; + + if ( div.getElementsByClassName("e").length === 1 ) + return; + Expr.order.splice(1, 0, "CLASS"); Expr.find.CLASS = function(match, context) { return context.getElementsByClassName(match[1]); }; -} +})(); function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { for ( var i = 0, l = checkSet.length; i < l; i++ ) { diff --git a/test/unit/selector.js b/test/unit/selector.js index 11112a5..e85fce7 100644 --- a/test/unit/selector.js +++ b/test/unit/selector.js @@ -56,7 +56,7 @@ test("broken", function() { }); test("id", function() { - expect(25); + expect(27); t( "ID Selector", "#body", ["body"] ); t( "ID Selector w/ Element", "body#body", ["body"] ); t( "ID Selector w/ Element", "ul#first", [] ); @@ -89,10 +89,13 @@ test("id", function() { t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986 isSet( jQuery("body").find("div#form"), [], "ID selector within the context of another element" ); + + t( "Underscore ID", "#types_all", ["types_all"] ); + t( "Dash ID", "#fx-queue", ["fx-queue"] ); }); test("class", function() { - expect(16); + expect(18); t( "Class Selector", ".blog", ["mark","simon"] ); t( "Class Selector", ".GROUPS", ["groups"] ); t( "Class Selector", ".blog.link", ["simon"] ); @@ -112,6 +115,14 @@ test("class", function() { t( "Descendant scaped Class", "div .test\\.foo\\[5\\]bar", ["test.foo[5]bar"] ); t( "Child escaped Class", "form > .foo\\:bar", ["foo:bar"] ); t( "Child escaped Class", "form > .test\\.foo\\[5\\]bar", ["test.foo[5]bar"] ); + + var div = document.createElement("div"); + div.innerHTML = "
"; + isSet( jQuery(".e", div), [ div.firstChild ], "Finding a second class." ); + + div.lastChild.className = "e"; + + isSet( jQuery(".e", div), [ div.firstChild, div.lastChild ], "Finding a modified class." ); }); test("name", function() {