From 8723f3b9e1db5d4fdcd50624441fe3536d1ae2f2 Mon Sep 17 00:00:00 2001 From: timmywil Date: Thu, 13 Oct 2011 11:11:41 -0400 Subject: [PATCH] Update sizzle; Add sizzle cache collision iframe test. Fixes #8539. --- src/sizzle | 2 +- .../html5_selector.html} | 44 ++++++++--------- test/data/selector/sizzle_cache.html | 40 ++++++++++++++++ test/unit/selector.js | 47 +++++++++++-------- 4 files changed, 91 insertions(+), 42 deletions(-) rename test/data/{selector.html => selector/html5_selector.html} (64%) create mode 100644 test/data/selector/sizzle_cache.html diff --git a/src/sizzle b/src/sizzle index 3ffd629e3..f56f17849 160000 --- a/src/sizzle +++ b/src/sizzle @@ -1 +1 @@ -Subproject commit 3ffd629e38c3a1cc31febc010718c985a4f85a4d +Subproject commit f56f1784961a63f4118e43b1441ffc2f32ef5d41 diff --git a/test/data/selector.html b/test/data/selector/html5_selector.html similarity index 64% rename from test/data/selector.html rename to test/data/selector/html5_selector.html index 8ffc6c6b3..28aa2b607 100644 --- a/test/data/selector.html +++ b/test/data/selector/html5_selector.html @@ -2,28 +2,28 @@ - jQuery selector - - - - - - - - - - - - - - - - - - - - - + jQuery selector - attributes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Worlds collide +
+ + + diff --git a/test/unit/selector.js b/test/unit/selector.js index 441258008..2c9dcec83 100644 --- a/test/unit/selector.js +++ b/test/unit/selector.js @@ -17,7 +17,7 @@ var testIframe = function( fileName, name, fn ) { var loadFixture = function() { // Creates iframe with cache disabled - var src = "./data/" + fileName + ".html?" + parseInt( Math.random()*1000, 10 ), + var src = "./data/selector/" + fileName + ".html?" + parseInt( Math.random()*1000, 10 ), iframe = jQuery("