Skip to content

Commit f89f5eb

Browse files
committed
Reorganized some of the animation tests to work with the new hide/show changes.
1 parent 7b5cfb7 commit f89f5eb

File tree

3 files changed

+23
-22
lines changed

3 files changed

+23
-22
lines changed

test/index.html

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -122,26 +122,6 @@ <h2 id="userAgent"></h2>
122122
<input name="types[]" id="types_movie" type="checkbox" value="movie" />
123123
</form>
124124

125-
<div id="fx-queue" name="test">
126-
<div id="fadein" class='chain test' name='div'>fadeIn<div>fadeIn</div></div>
127-
<div id="fadeout" class='chain test out'>fadeOut<div>fadeOut</div></div>
128-
129-
<div id="show" class='chain test'>show<div>show</div></div>
130-
<div id="hide" class='chain test out'>hide<div>hide</div></div>
131-
132-
<div id="togglein" class='chain test'>togglein<div>togglein</div></div>
133-
<div id="toggleout" class='chain test out'>toggleout<div>toggleout</div></div>
134-
135-
136-
<div id="slideup" class='chain test'>slideUp<div>slideUp</div></div>
137-
<div id="slidedown" class='chain test out'>slideDown<div>slideDown</div></div>
138-
139-
<div id="slidetogglein" class='chain test'>slideToggleIn<div>slideToggleIn</div></div>
140-
<div id="slidetoggleout" class='chain test out'>slideToggleOut<div>slideToggleOut</div></div>
141-
</div>
142-
143-
<div id="fx-tests"></div>
144-
145125
<form id="testForm" action="#" method="get">
146126
<textarea name="T3" rows="2" cols="15">?
147127
Z</textarea>
@@ -221,6 +201,27 @@ <h2 id="userAgent"></h2>
221201
</div>
222202
</div>
223203
</dl>
204+
<div id="fx-test-group" style="width:1px;height:1px;overflow:hidden;">
205+
<div id="fx-queue" name="test">
206+
<div id="fadein" class='chain test' name='div'>fadeIn<div>fadeIn</div></div>
207+
<div id="fadeout" class='chain test out'>fadeOut<div>fadeOut</div></div>
208+
209+
<div id="show" class='chain test'>show<div>show</div></div>
210+
<div id="hide" class='chain test out'>hide<div>hide</div></div>
211+
212+
<div id="togglein" class='chain test'>togglein<div>togglein</div></div>
213+
<div id="toggleout" class='chain test out'>toggleout<div>toggleout</div></div>
214+
215+
216+
<div id="slideup" class='chain test'>slideUp<div>slideUp</div></div>
217+
<div id="slidedown" class='chain test out'>slideDown<div>slideDown</div></div>
218+
219+
<div id="slidetogglein" class='chain test'>slideToggleIn<div>slideToggleIn</div></div>
220+
<div id="slidetoggleout" class='chain test out'>slideToggleOut<div>slideToggleOut</div></div>
221+
</div>
222+
223+
<div id="fx-tests"></div>
224+
</div>
224225

225226
<ol id="tests"></ol>
226227
</body>

test/unit/core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1441,7 +1441,7 @@ test("closest()", function() {
14411441
isSet( jQuery("#main").closest("span,#html").get(), q("html"), "closest(span,#html)" );
14421442

14431443
isSet( jQuery("div:eq(1)").closest("div:first").get(), [], "closest(div:first)" );
1444-
isSet( jQuery("div").closest("body:first div:last").get(), q("liveHandlerOrder"), "closest(body:first div:last)" );
1444+
isSet( jQuery("div").closest("body:first div:last").get(), q("fx-tests"), "closest(body:first div:last)" );
14451445
});
14461446

14471447
test("not()", function() {

test/unit/fx.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ test("stop(clearQueue, gotoEnd)", function() {
184184

185185
test("toggle()", function() {
186186
expect(6);
187-
var x = jQuery("#foo");
187+
var x = jQuery("#nothiddendiv");
188188
ok( x.is(":visible"), "is visible" );
189189
x.toggle();
190190
ok( x.is(":hidden"), "is hidden" );

0 commit comments

Comments
 (0)