Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 6e75fe5f1945893cce3ced481e586d8ad6cbfa1d 1 parent e8f9151
Timo Tijhof Krinkle authored gibson042 committed
36 test/data/testsuite.css
... ... @@ -1,5 +1,8 @@
1 1 /* for testing opacity set in styles in IE */
2   -ol#empty { opacity: 0; filter:Alpha(opacity=0) progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffff0000', EndColorStr='#ffffffff'); }
  2 +ol#empty {
  3 + opacity: 0;
  4 + filter:Alpha(opacity=0) progid:DXImageTransform.Microsoft.gradient(startColorStr='#ffff0000', EndColorStr='#ffffffff');
  5 +}
3 6
4 7 div#fx-tests h4 {
5 8 background: red;
@@ -93,14 +96,33 @@ div#fx-tests div.noback {
93 96 background-image: none;
94 97 }
95 98
96   -div.chain, div.chain div { width: 100px; height: 20px; position: relative; float: left; }
97   -div.chain div { position: absolute; top: 0px; left: 0px; }
  99 +.chain-test,
  100 +.chain-test div {
  101 + width: 100px;
  102 + height: 20px;
  103 + position: relative;
  104 + float: left;
  105 +}
  106 +.chain-test div {
  107 + position: absolute;
  108 + top: 0;
  109 + left: 0;
  110 +}
98 111
99   -div.chain.test { background: red; }
100   -div.chain.test div { background: green; }
  112 +.chain-test {
  113 + background: red;
  114 +}
  115 +.chain-test div {
  116 + background: green;
  117 +}
101 118
102   -div.chain.out { background: green; }
103   -div.chain.out div { background: red; display: none; }
  119 +.chain-test-out {
  120 + background: green;
  121 +}
  122 +.chain-test-out div {
  123 + background: red;
  124 + display: none;
  125 +}
104 126
105 127 /* tests to ensure jQuery can determine the native display mode of elements
106 128 that have been set as display: none in stylesheets */
28 test/index.html
@@ -289,28 +289,28 @@ <h2 id="qunit-userAgent"></h2>
289 289 </em>
290 290 <span id="siblingspan"></span>
291 291 </div>
292   - <div id="fx-test-group" style="position:absolute;width:1px;height:1px;overflow:hidden;">
  292 + <div id="fx-test-group" style="position: absolute; width: 1px; height: 1px; overflow: hidden;">
293 293 <div id="fx-queue" name="test">
294   - <div id="fadein" class='chain test' name='div'>fadeIn<div>fadeIn</div></div>
295   - <div id="fadeout" class='chain test out'>fadeOut<div>fadeOut</div></div>
  294 + <div id="fadein" class='chain-test' name='div'>fadeIn<div>fadeIn</div></div>
  295 + <div id="fadeout" class='chain-test chain-test-out'>fadeOut<div>fadeOut</div></div>
296 296
297   - <div id="show" class='chain test'>show<div>show</div></div>
298   - <div id="hide" class='chain test out'>hide<div>hide</div></div>
  297 + <div id="show" class='chain-test'>show<div>show</div></div>
  298 + <div id="hide" class='chain-test chain-test-out'>hide<div>hide</div></div>
299 299
300   - <div id="togglein" class='chain test'>togglein<div>togglein</div></div>
301   - <div id="toggleout" class='chain test out'>toggleout<div>toggleout</div></div>
  300 + <div id="togglein" class='chain-test'>togglein<div>togglein</div></div>
  301 + <div id="toggleout" class='chain-test chain-test-out'>toggleout<div>toggleout</div></div>
302 302
303 303
304   - <div id="slideup" class='chain test'>slideUp<div>slideUp</div></div>
305   - <div id="slidedown" class='chain test out'>slideDown<div>slideDown</div></div>
  304 + <div id="slideup" class='chain-test'>slideUp<div>slideUp</div></div>
  305 + <div id="slidedown" class='chain-test chain-test-out'>slideDown<div>slideDown</div></div>
306 306
307   - <div id="slidetogglein" class='chain test'>slideToggleIn<div>slideToggleIn</div></div>
308   - <div id="slidetoggleout" class='chain test out'>slideToggleOut<div>slideToggleOut</div></div>
  307 + <div id="slidetogglein" class='chain-test'>slideToggleIn<div>slideToggleIn</div></div>
  308 + <div id="slidetoggleout" class='chain-test chain-test-out'>slideToggleOut<div>slideToggleOut</div></div>
309 309
310   - <div id="fadetogglein" class='chain test'>fadeToggleIn<div>fadeToggleIn</div></div>
311   - <div id="fadetoggleout" class='chain test out'>fadeToggleOut<div>fadeToggleOut</div></div>
  310 + <div id="fadetogglein" class='chain-test'>fadeToggleIn<div>fadeToggleIn</div></div>
  311 + <div id="fadetoggleout" class='chain-test chain-test-out'>fadeToggleOut<div>fadeToggleOut</div></div>
312 312
313   - <div id="fadeto" class='chain test'>fadeTo<div>fadeTo</div></div>
  313 + <div id="fadeto" class='chain-test'>fadeTo<div>fadeTo</div></div>
314 314 </div>
315 315
316 316 <div id="fx-tests"></div>
6 test/unit/effects.js
@@ -1029,6 +1029,10 @@ jQuery.checkState = function() {
1029 1029 };
1030 1030
1031 1031 // Chaining Tests
  1032 +// We need to pass jQuery.support.shrinkWrapBlocks for all tests that
  1033 +// set overflow hidden (which effect.js does for all slide*() methods and
  1034 +// show()/hide() if a speed is given).
  1035 +
1032 1036 test("Chain fadeOut fadeIn", function() {
1033 1037 jQuery("#fadein div").saveState().fadeOut("fast").fadeIn("fast", jQuery.checkState );
1034 1038 });
@@ -1043,7 +1047,7 @@ test("Chain show hide", function() {
1043 1047 jQuery("#hide div").saveState( jQuery.support.shrinkWrapBlocks ).show("fast").hide("fast", jQuery.checkState );
1044 1048 });
1045 1049 test("Chain show hide with easing and callback", function() {
1046   - jQuery("#hide div").saveState().show("fast").hide("fast","linear", jQuery.checkState );
  1050 + jQuery("#hide div").saveState( jQuery.support.shrinkWrapBlocks ).show("fast").hide("fast","linear", jQuery.checkState );
1047 1051 });
1048 1052
1049 1053 test("Chain toggle in", function() {

0 comments on commit 6e75fe5

Please sign in to comment.
Something went wrong with that request. Please try again.