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

#3881.
jquery · Dec 5, 2009 · b24da33 · b24da33
1 parent 8d1efee
commit b24da33
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/fx.js b/src/fx.js
@@ -432,7 +432,7 @@ jQuery.extend( jQuery.fx, {
 
 		_default: function(fx){
 			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 {
 				fx.elem[ fx.prop ] = fx.now;
 			}

diff --git a/test/unit/fx.js b/test/unit/fx.js
@@ -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
 test("animate option (queue === false)", function () {
 	expect(1);