Skip to content

Commit

Permalink
Fix acme bug with attribute selectors in IE10 quirks mode. Although I…
Browse files Browse the repository at this point in the history
…E10 is working now, there's still a lot of has("ie") browser sniffing in acme.js that would be nice to get rid of, because it's probably doing stuff that IE10 doesn't need.

Restored the quirks mode query tests removed in [30019].   This essentially makes two copies of query.html; the alternative is to use dijit/tests/_loadTest.js, but that's in dijit rather than core.   Also, not running the quirks mode tests from  the test runner (i.e. from dojo/tests/query.js) due to the IE9+ problem where the iframe is in quirks mode but the parent is standards mode.

Fixes #16418 on trunk !strict.

git-svn-id: http://svn.dojotoolkit.org/src/dojo/trunk@30105 560b804f-0ae3-0310-86f3-f6aa0a117693
  • Loading branch information
wkeese committed Dec 3, 2012
1 parent 9dacb84 commit d4b5654
Show file tree
Hide file tree
Showing 3 changed files with 465 additions and 1 deletion.
2 changes: 1 addition & 1 deletion selector/acme.js
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ define([
}
};

var defaultGetter = (has("ie") && (has("ie") < 9 || has("quirks"))) ? function(cond){
var defaultGetter = (has("ie") < 9 || has("ie") == 9 && has("quirks")) ? function(cond){
var clc = cond.toLowerCase();
if(clc == "class"){ cond = "className"; }
return function(elem){
Expand Down
11 changes: 11 additions & 0 deletions tests/query.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@ define(["doh/main", "dojo/sniff", "require"], function(doh, has, require){
doh.register("tests.query-acme", require.toUrl("./query/query.html?selector=acme"), 30000);
doh.register("tests.query-unspecified", require.toUrl("./query/query.html"), 30000);

// Test quirks mode too, except on IE9+ because of the IE problem where the iframe gets confused about its
// mode when the iframe is quirks but the parent is standards.
if(!(has("ie") >= 9)){
doh.register("tests.query-lite-quirks", require.toUrl("./query/queryQuirks.html?selector=lite"), 30000);
doh.register("tests.query-css2-quirks", require.toUrl("./query/queryQuirks.html?selector=css2"), 30000);
doh.register("tests.query-css2.1-quirks", require.toUrl("./query/queryQuirks.html?selector=css2.1"), 30000);
doh.register("tests.query-css3-quirks", require.toUrl("./query/queryQuirks.html?selector=css3"), 30000);
doh.register("tests.query-acme-quirks", require.toUrl("./query/queryQuirks.html?selector=acme"), 30000);
doh.register("tests.query-unspecified-quirks", require.toUrl("./query/queryQuirks.html"), 30000);
}

// Test loading XHTML document. Commented out on IE since it causes a warning dialog
if(!has("ie")){
doh.register("tests.query-xml", require.toUrl("./query/xml.xhtml"), 30000);
Expand Down
Loading

0 comments on commit d4b5654

Please sign in to comment.