Now handle the case where Safari's querySelectorAll fails on uppercase characters...
authorJohn Resig <jeresig@gmail.com>
Wed, 21 Jan 2009 22:57:07 +0000 (22:57 +0000)
committerJohn Resig <jeresig@gmail.com>
Wed, 21 Jan 2009 22:57:07 +0000 (22:57 +0000)
src/selector.js
test/index.html
test/unit/selector.js

index 65563a1..6a629bd 100644 (file)
@@ -709,7 +709,14 @@ try {
 })();
 
 if ( document.querySelectorAll ) (function(){
-       var oldSizzle = Sizzle;
+       var oldSizzle = Sizzle, div = document.createElement("div");
+       div.innerHTML = "<p class='TEST'></p>";
+
+       // Safari can't handle uppercase or unicode characters when
+       // in quirks mode.
+       if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+               return;
+       }
        
        Sizzle = function(query, context, extra, seed){
                context = context || document;
index 7ded485..89244d7 100644 (file)
@@ -39,7 +39,7 @@
                <p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p>
                <p id="ap">
                        Here are some links in a normal paragraph: <a id="google" href="http://www.google.com/" title="Google!">Google</a>, 
-                       <a id="groups" href="http://groups.google.com/">Google Groups (Link)</a>. 
+                       <a id="groups" href="http://groups.google.com/" class="GROUPS">Google Groups (Link)</a>. 
                        This link has <code><a href="http://smin" id="anchor1">class="blog"</a></code>: 
                        <a href="http://diveintomark.org/" class="blog" hreflang="en" id="mark">diveintomark</a>
 
index 5103d58..0b2a328 100644 (file)
@@ -88,8 +88,9 @@ test("id", function() {
 });
 
 test("class", function() {
-       expect(15);
+       expect(16);
        t( "Class Selector", ".blog", ["mark","simon"] );
+       t( "Class Selector", ".GROUPS", ["groups"] );
        t( "Class Selector", ".blog.link", ["simon"] );
        t( "Class Selector w/ Element", "a.blog", ["mark","simon"] );
        t( "Parent Class Selector", "p .blog", ["mark","simon"] );
@@ -100,7 +101,7 @@ test("class", function() {
        t( "Class selector using UTF8", ".台北Táiběi, .台北", ["utf8class1","utf8class2"] );
        t( "Descendant class selector using UTF8", "div .台北Táiběi", ["utf8class1"] );
        t( "Child class selector using UTF8", "form > .台北Táiběi", ["utf8class1"] );
-       
+
        t( "Escaped Class", ".foo\\:bar", ["foo:bar"] );
        t( "Escaped Class", ".test\\.foo\\[5\\]bar", ["test.foo[5]bar"] );
        t( "Descendant scaped Class", "div .foo\\:bar", ["foo:bar"] );
@@ -128,16 +129,10 @@ test("name", function() {
 test("multiple", function() {
        expect(4);
        
-       var results = ["mark","simon","firstp","ap","sndp","en","sap","first"];
-       
-       if ( document.querySelectorAll ) {
-               results = ["firstp","ap","mark","sndp","en","sap","simon","first"];
-       }
-       
-       t( "Comma Support", "a.blog, p", results);
-       t( "Comma Support", "a.blog , p", results);
-       t( "Comma Support", "a.blog ,p", results);
-       t( "Comma Support", "a.blog,p", results);
+       t( "Comma Support", "h2, p", ["banner","userAgent","firstp","ap","sndp","en","sap","first"]);
+       t( "Comma Support", "h2 , p", ["banner","userAgent","firstp","ap","sndp","en","sap","first"]);
+       t( "Comma Support", "h2 , p", ["banner","userAgent","firstp","ap","sndp","en","sap","first"]);
+       t( "Comma Support", "h2,p", ["banner","userAgent","firstp","ap","sndp","en","sap","first"]);
 });
 
 test("child and adjacent", function() {
@@ -224,12 +219,6 @@ test("attributes", function() {
        t( "for Attribute", "form label[for]", ["label-for"] );
        t( "for Attribute in form", "#form [for=action]", ["label-for"] );
        
-       var results = ["hidden1","radio1","radio2"];
-       
-       if ( document.querySelectorAll ) {
-               results = ["radio1", "radio2", "hidden1"];
-       }
-
        t( "Attribute containing []", "input[name^='foo[']", ["hidden2"] );
        t( "Attribute containing []", "input[name^='foo[bar]']", ["hidden2"] );
        t( "Attribute containing []", "input[name*='[bar]']", ["hidden2"] );
@@ -238,9 +227,9 @@ test("attributes", function() {
        t( "Attribute containing []", "input[name$='foo[bar]']", ["hidden2"] );
        t( "Attribute containing []", "input[name*='foo[bar]']", ["hidden2"] );
        
-       t( "Multiple Attribute Equals", "#form input[type='hidden'],#form input[type='radio']", results );
-       t( "Multiple Attribute Equals", "#form input[type=\"hidden\"],#form input[type='radio']", results );
-       t( "Multiple Attribute Equals", "#form input[type=hidden],#form input[type=radio]", results );
+       t( "Multiple Attribute Equals", "#form input[type='radio'], #form input[type='hidden']", ["radio1", "radio2", "hidden1"] );
+       t( "Multiple Attribute Equals", "#form input[type='radio'], #form input[type=\"hidden\"]", ["radio1", "radio2", "hidden1"] );
+       t( "Multiple Attribute Equals", "#form input[type='radio'], #form input[type=hidden]", ["radio1", "radio2", "hidden1"] );
        
        t( "Attribute selector using UTF8", "span[lang=中文]", ["台北"] );