Permalink
Browse files

Fix #12846. Restore overflow when animation is stopped.

  • Loading branch information...
1 parent b594673 commit a6c358d04693c5746e1557a2660dfccb169ad831 @dmethvin dmethvin committed Jan 27, 2013
Showing with 5 additions and 3 deletions.
  1. +1 −1 src/effects.js
  2. +4 −2 test/unit/effects.js
View
@@ -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 ];
View
@@ -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 );
});
});
});

0 comments on commit a6c358d

Please sign in to comment.