diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/data/testsuite.css | 36 | ||||
| -rw-r--r-- | test/index.html | 28 | ||||
| -rw-r--r-- | test/unit/effects.js | 6 |
3 files changed, 48 insertions, 22 deletions
diff --git a/test/data/testsuite.css b/test/data/testsuite.css index aae0d8d96..6bb3a5ded 100644 --- a/test/data/testsuite.css +++ b/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 */ diff --git a/test/index.html b/test/index.html index 53dec94c0..a68716ccf 100644 --- a/test/index.html +++ b/test/index.html @@ -289,28 +289,28 @@ Z</textarea> </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> diff --git a/test/unit/effects.js b/test/unit/effects.js index ca6f2698e..b4ba10ba4 100644 --- a/test/unit/effects.js +++ b/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() { |