From f9a584972365bda0631116ec6fe07df9b6f9c372 Mon Sep 17 00:00:00 2001 From: John Resig Date: Wed, 21 Jan 2009 22:57:07 +0000 Subject: [PATCH] Now handle the case where Safari's querySelectorAll fails on uppercase characters in quirks mode. Added a test to check for it and re-worked some of the existing tests to better handle document order issues. Fixes jQuery bug #3840. --- src/selector.js | 9 ++++++++- test/index.html | 2 +- test/unit/selector.js | 31 ++++++++++--------------------- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/src/selector.js b/src/selector.js index 65563a1..6a629bd 100644 --- a/src/selector.js +++ b/src/selector.js @@ -709,7 +709,14 @@ try { })(); if ( document.querySelectorAll ) (function(){ - var oldSizzle = Sizzle; + var oldSizzle = Sizzle, div = document.createElement("div"); + div.innerHTML = "

"; + + // 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; diff --git a/test/index.html b/test/index.html index 7ded485..89244d7 100644 --- a/test/index.html +++ b/test/index.html @@ -39,7 +39,7 @@

See this blog entry for more information.

Here are some links in a normal paragraph: Google, - Google Groups (Link). + Google Groups (Link). This link has class="blog": diveintomark diff --git a/test/unit/selector.js b/test/unit/selector.js index 5103d58..0b2a328 100644 --- a/test/unit/selector.js +++ b/test/unit/selector.js @@ -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=中文]", ["台北"] ); -- 1.7.10.4