diff options
| author | John Resig <jeresig@gmail.com> | 2007-05-20 08:40:13 +0000 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2007-05-20 08:40:13 +0000 |
| commit | 9b5363b9eb197515e31589894c945dfd70b8b93b (patch) | |
| tree | 824224eea7b33f83dba199ceeaccd63d909c94ac /build | |
| parent | 33c097bd1e3caf623cc9a1e4518150c5a2233e93 (diff) | |
| download | jquery-9b5363b9eb197515e31589894c945dfd70b8b93b.tar.gz jquery-9b5363b9eb197515e31589894c945dfd70b8b93b.zip | |
Added fixes for bug #1052. Fixes the problems with animation chaining (and problems with toggling). Also, removed toggling from jQuery.fx (it's now handled in .animate() instead).
Diffstat (limited to 'build')
| -rw-r--r-- | build/test/fx.html | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/build/test/fx.html b/build/test/fx.html index 050513a40..07b60f975 100644 --- a/build/test/fx.html +++ b/build/test/fx.html @@ -96,6 +96,15 @@ div#tests div.widewidth.wideheight { div#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; } + +div.chain.test { background: red; } +div.chain.test div { background: green; } + +div.chain.out { background: green; } +div.chain.out div { background: red; display: none; } </style> <script> var visible = { @@ -272,6 +281,22 @@ $(document).ready(function(){ }); }); }); + + // Chaining Tests + $('#fadein div').fadeOut('fast').fadeIn('fast'); + $('#fadeout div').fadeIn('fast').fadeOut('fast'); + + $('#show div').hide('fast').show('fast'); + $('#hide div').show('fast').hide('fast'); + + $('#togglein div').toggle('fast').toggle('fast'); + $('#toggleout div').toggle('fast').toggle('fast'); + + $('#slidedown div').slideDown('fast').slideUp('fast'); + $('#slideup div').slideUp('fast').slideDown('fast'); + + $('#slidetogglein div').slideToggle('fast').slideToggle('fast'); + $('#slidetoggleout div').slideToggle('fast').slideToggle('fast'); }); function pass( elem ) { @@ -302,6 +327,24 @@ function msg(elem,txt){ </script> </head> <body> +<b>Chain Tests:</b><br/> +<div id="fadein" class='chain test'>fadeIn<div>fadeIn</div></div> +<div id="fadeout" class='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="togglein" class='chain test'>togglein<div>togglein</div></div> +<div id="toggleout" class='chain test out'>toggleout<div>toggleout</div></div> +<br style="clear:both;"/> + +<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="slidetogglein" class='chain test'>slideToggleIn<div>slideToggleIn</div></div> +<div id="slidetoggleout" class='chain test out'>slideToggleOut<div>slideToggleOut</div></div> +<br style="clear:both;"/> + <div id="tests"></div> </body> </html> |