Commit 94924a05 authored by Corey Frang's avatar Corey Frang

Fix the logic to set overflow:hidden on width & height animations - Fixes #12117 - Closes gh-869

parent 30168722
...@@ -269,7 +269,7 @@ function defaultPrefilter( elem, props, opts ) { ...@@ -269,7 +269,7 @@ function defaultPrefilter( elem, props, opts ) {
} }
// height/width overflow pass // height/width overflow pass
if ( elem.nodeType === 1 && ( props.height || props.width ) ) { if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
// Make sure that nothing sneaks out // Make sure that nothing sneaks out
// Record all 3 overflow attributes because IE does not // Record all 3 overflow attributes because IE does not
// change the overflow attribute when overflowX and // change the overflow attribute when overflowX and
......
...@@ -1785,4 +1785,18 @@ asyncTest("Animation callbacks (#11797)", 15, function() { ...@@ -1785,4 +1785,18 @@ asyncTest("Animation callbacks (#11797)", 15, function() {
}); });
}); });
test( "Animate properly sets overflow hidden when animating width/height (#12117)", 4, function() {
jQuery.each( [ "height", "width" ], function( _, prop ) {
jQuery.each( [ 100, 0 ], function( _, value ) {
var div = jQuery("<div>"),
props = {};
props[ prop ] = value;
div.animate( props, 1 );
equal( div.css( "overflow" ), "hidden",
"overflow: hidden set when animating " + prop + " to " + value );
div.stop();
});
});
});
} // if ( jQuery.fx ) } // if ( jQuery.fx )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment