deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make sure that width or height don't animate to a negative value. Fixes #3881.

Browse source
This commit is contained in:
John Resig 2009-12-05 00:10:19 -05:00
parent 8d1efee316
commit b24da33f52
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/fx.js
View file

@ -432,7 +432,7 @@ jQuery.extend( jQuery.fx, {
_default: function(fx){ _default: function(fx){
if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) { if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
fx.elem.style[ fx.prop ] = fx.now + fx.unit; fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
} else { } else {
fx.elem[ fx.prop ] = fx.now; fx.elem[ fx.prop ] = fx.now;
} }

9
test/unit/fx.js
View file

@ -52,6 +52,15 @@ test("animate(Hash, Object, Function)", function() {
}); });
}); });
test("animate negative height", function() {
expect(1);
stop();
jQuery("#foo").animate({ height: -100 }, 100, function() {
equals( this.offsetHeight, 0, "Verify height." );
start();
});
});
/* // This test ends up being flaky depending upon the CPU load /* // This test ends up being flaky depending upon the CPU load
test("animate option (queue === false)", function () { test("animate option (queue === false)", function () {
expect(1); expect(1);