mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Add unit tests for animation toggling from hide position. Supplements #10848.
This commit is contained in:
parent
e8673ae1aa
commit
4eef88cf6d
27
test/unit/effects.js
vendored
27
test/unit/effects.js
vendored
@ -1146,13 +1146,15 @@ jQuery.each({
|
|||||||
},
|
},
|
||||||
function( method, defProp ) {
|
function( method, defProp ) {
|
||||||
test( method + "().stop()." + method + "()", function() {
|
test( method + "().stop()." + method + "()", function() {
|
||||||
expect( 4 );
|
expect( 8 );
|
||||||
|
|
||||||
|
var animTime = 100;
|
||||||
|
|
||||||
jQuery.each([ "in", "out" ], function( i, type ) {
|
jQuery.each([ "in", "out" ], function( i, type ) {
|
||||||
var $elem = jQuery( "#" + method.toLowerCase() + type ),
|
var $elem = jQuery( "#" + method.toLowerCase() + type ),
|
||||||
startVal = defProp( $elem );
|
startVal = defProp( $elem );
|
||||||
|
|
||||||
$elem[ method ]("fast");
|
$elem[ method ]( animTime );
|
||||||
stop();
|
stop();
|
||||||
|
|
||||||
setTimeout( function() {
|
setTimeout( function() {
|
||||||
@ -1160,11 +1162,26 @@ function( method, defProp ) {
|
|||||||
|
|
||||||
notEqual( defProp( $elem ), startVal, ".stop() is called about halfway through animation." );
|
notEqual( defProp( $elem ), startVal, ".stop() is called about halfway through animation." );
|
||||||
|
|
||||||
$elem[ method ]("fast", function() {
|
$elem[ method ](animTime, function() {
|
||||||
equal( defProp( jQuery(this) ), startVal, "After doing .stop() halfway, check that state has been saved for returning to original property value." );
|
equal( defProp( $elem ), startVal, "After doing .stop() halfway through hide, check that state has been saved for returning to original property value." );
|
||||||
|
|
||||||
|
// Start from hidden position to show this time
|
||||||
|
$elem.hide()[ method ]( animTime );
|
||||||
|
setTimeout( function() {
|
||||||
|
$elem.stop();
|
||||||
|
|
||||||
|
notEqual( defProp( $elem ), startVal, ".stop() is called about halfway through animation." );
|
||||||
|
|
||||||
|
$elem[ method ](animTime, function() {
|
||||||
|
equal( defProp( $elem ), startVal, "After doing .stop() halfway through show, check that state has been saved for returning to original property value." );
|
||||||
|
|
||||||
|
// Remove olddisplay data from .hide() call
|
||||||
|
jQuery.removeData( this, "olddisplay", true );
|
||||||
start();
|
start();
|
||||||
});
|
});
|
||||||
}, 100);
|
}, animTime / 2);
|
||||||
|
});
|
||||||
|
}, animTime / 2);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user