Skip to content

Commit

Permalink
Fix the logic to set overflow:hidden on width & height animations - F…
Browse files Browse the repository at this point in the history
…ixes #12117 - Closes gh-869
  • Loading branch information
gnarf committed Jul 20, 2012
1 parent 3016872 commit 94924a0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/effects.js
Expand Up @@ -269,7 +269,7 @@ function defaultPrefilter( elem, props, opts ) {
}

// 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
// Record all 3 overflow attributes because IE does not
// change the overflow attribute when overflowX and
Expand Down
14 changes: 14 additions & 0 deletions test/unit/effects.js
Expand Up @@ -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 )

0 comments on commit 94924a0

Please sign in to comment.