diff options
| -rw-r--r-- | src/effects.js | 2 | ||||
| -rw-r--r-- | test/unit/effects.js | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/effects.js b/src/effects.js index e1c11dca5..764895200 100644 --- a/src/effects.js +++ b/src/effects.js @@ -295,7 +295,7 @@ function defaultPrefilter( elem, props, opts ) { if ( opts.overflow ) { style.overflow = "hidden"; - anim.done(function() { + anim.always(function() { style.overflow = opts.overflow[ 0 ]; style.overflowX = opts.overflow[ 1 ]; style.overflowY = opts.overflow[ 2 ]; diff --git a/test/unit/effects.js b/test/unit/effects.js index 3f986097e..8c56581db 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -1758,16 +1758,18 @@ asyncTest("Animation callbacks (#11797)", 15, function() { }); }); -test( "Animate properly sets overflow hidden when animating width/height (#12117)", 4, function() { +test( "Animate properly sets overflow hidden when animating width/height (#12117)", 8, function() { jQuery.each( [ "height", "width" ], function( _, prop ) { jQuery.each( [ 100, 0 ], function( _, value ) { - var div = jQuery("<div>"), + var div = jQuery("<div>").css( "overflow", "auto" ), props = {}; props[ prop ] = value; div.animate( props, 1 ); equal( div.css( "overflow" ), "hidden", "overflow: hidden set when animating " + prop + " to " + value ); div.stop(); + equal( div.css( "overflow" ), "auto", + "overflow: auto restored after animating " + prop + " to " + value ); }); }); }); |