Browse files

No ticket: fix effects test failure in IE6. Close gh-1012.

  • Loading branch information...
1 parent e8f9151 commit 6e75fe5f1945893cce3ced481e586d8ad6cbfa1d @Krinkle Krinkle committed with gibson042 Oct 31, 2012
Showing with 48 additions and 22 deletions.
  1. +29 −7 test/data/testsuite.css
  2. +14 −14 test/index.html
  3. +5 −1 test/unit/effects.js
View
36 test/data/testsuite.css
@@ -1,5 +1,8 @@
/* for testing opacity set in styles in IE */
-ol#empty { opacity: 0; filter:Alpha(opacity=0) progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffff0000', EndColorStr='#ffffffff'); }
+ol#empty {
+ opacity: 0;
+ filter:Alpha(opacity=0) progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffff0000', EndColorStr='#ffffffff');
+}
div#fx-tests h4 {
background: red;
@@ -93,14 +96,33 @@ div#fx-tests div.noback {
background-image: none;
}
-div.chain, div.chain div { width: 100px; height: 20px; position: relative; float: left; }
-div.chain div { position: absolute; top: 0px; left: 0px; }
+.chain-test,
+.chain-test div {
+ width: 100px;
+ height: 20px;
+ position: relative;
+ float: left;
+}
+.chain-test div {
+ position: absolute;
+ top: 0;
+ left: 0;
+}
-div.chain.test { background: red; }
-div.chain.test div { background: green; }
+.chain-test {
+ background: red;
+}
+.chain-test div {
+ background: green;
+}
-div.chain.out { background: green; }
-div.chain.out div { background: red; display: none; }
+.chain-test-out {
+ background: green;
+}
+.chain-test-out div {
+ background: red;
+ display: none;
+}
/* tests to ensure jQuery can determine the native display mode of elements
that have been set as display: none in stylesheets */
View
28 test/index.html
@@ -289,28 +289,28 @@ <h2 id="qunit-userAgent"></h2>
</em>
<span id="siblingspan"></span>
</div>
- <div id="fx-test-group" style="position:absolute;width:1px;height:1px;overflow:hidden;">
+ <div id="fx-test-group" style="position: absolute; width: 1px; height: 1px; overflow: hidden;">
<div id="fx-queue" name="test">
- <div id="fadein" class='chain test' name='div'>fadeIn<div>fadeIn</div></div>
- <div id="fadeout" class='chain test out'>fadeOut<div>fadeOut</div></div>
+ <div id="fadein" class='chain-test' name='div'>fadeIn<div>fadeIn</div></div>
+ <div id="fadeout" class='chain-test chain-test-out'>fadeOut<div>fadeOut</div></div>
- <div id="show" class='chain test'>show<div>show</div></div>
- <div id="hide" class='chain test out'>hide<div>hide</div></div>
+ <div id="show" class='chain-test'>show<div>show</div></div>
+ <div id="hide" class='chain-test chain-test-out'>hide<div>hide</div></div>
- <div id="togglein" class='chain test'>togglein<div>togglein</div></div>
- <div id="toggleout" class='chain test out'>toggleout<div>toggleout</div></div>
+ <div id="togglein" class='chain-test'>togglein<div>togglein</div></div>
+ <div id="toggleout" class='chain-test chain-test-out'>toggleout<div>toggleout</div></div>
- <div id="slideup" class='chain test'>slideUp<div>slideUp</div></div>
- <div id="slidedown" class='chain test out'>slideDown<div>slideDown</div></div>
+ <div id="slideup" class='chain-test'>slideUp<div>slideUp</div></div>
+ <div id="slidedown" class='chain-test chain-test-out'>slideDown<div>slideDown</div></div>
- <div id="slidetogglein" class='chain test'>slideToggleIn<div>slideToggleIn</div></div>
- <div id="slidetoggleout" class='chain test out'>slideToggleOut<div>slideToggleOut</div></div>
+ <div id="slidetogglein" class='chain-test'>slideToggleIn<div>slideToggleIn</div></div>
+ <div id="slidetoggleout" class='chain-test chain-test-out'>slideToggleOut<div>slideToggleOut</div></div>
- <div id="fadetogglein" class='chain test'>fadeToggleIn<div>fadeToggleIn</div></div>
- <div id="fadetoggleout" class='chain test out'>fadeToggleOut<div>fadeToggleOut</div></div>
+ <div id="fadetogglein" class='chain-test'>fadeToggleIn<div>fadeToggleIn</div></div>
+ <div id="fadetoggleout" class='chain-test chain-test-out'>fadeToggleOut<div>fadeToggleOut</div></div>
- <div id="fadeto" class='chain test'>fadeTo<div>fadeTo</div></div>
+ <div id="fadeto" class='chain-test'>fadeTo<div>fadeTo</div></div>
</div>
<div id="fx-tests"></div>
View
6 test/unit/effects.js
@@ -1029,6 +1029,10 @@ jQuery.checkState = function() {
};
// Chaining Tests
+// We need to pass jQuery.support.shrinkWrapBlocks for all tests that
+// set overflow hidden (which effect.js does for all slide*() methods and
+// show()/hide() if a speed is given).
+
test("Chain fadeOut fadeIn", function() {
jQuery("#fadein div").saveState().fadeOut("fast").fadeIn("fast", jQuery.checkState );
});
@@ -1043,7 +1047,7 @@ test("Chain show hide", function() {
jQuery("#hide div").saveState( jQuery.support.shrinkWrapBlocks ).show("fast").hide("fast", jQuery.checkState );
});
test("Chain show hide with easing and callback", function() {
- jQuery("#hide div").saveState().show("fast").hide("fast","linear", jQuery.checkState );
+ jQuery("#hide div").saveState( jQuery.support.shrinkWrapBlocks ).show("fast").hide("fast","linear", jQuery.checkState );
});
test("Chain toggle in", function() {

0 comments on commit 6e75fe5

Please sign in to comment.