From: Richard Gibson <richard.gibson@gmail.com>
Date: Sun, 26 May 2013 20:02:32 +0000 (-0400)
Subject: Fix #13939: Same-unit relative animations
X-Git-Tag: 2.0.2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=26980c6ec96369bbaf87be1e405594df8ec3f0dc;p=jquery.git

Fix #13939: Same-unit relative animations
(cherry picked from commit 00231d5d94d3374d53bfe79e04ba253250c73087)
---

diff --git a/src/effects.js b/src/effects.js
index 78f36827a..cb78b5cfe 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -42,8 +42,8 @@ var fxNow, timerId,
 
 			// Update tween properties
 			if ( parts ) {
+				start = tween.start = +start || +target || 0;
 				tween.unit = unit;
-				tween.start = +start || +target || 0;
 				// If a +=/-= token was provided, we're doing a relative animation
 				tween.end = parts[ 1 ] ?
 					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
diff --git a/test/unit/effects.js b/test/unit/effects.js
index d59ff84a6..05f1c017a 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -204,6 +204,46 @@ test("animate(Hash, Object, Function)", function() {
 	});
 });
 
+test("animate relative values", function() {
+	stop();
+
+	var value = 40,
+		bases = [ "%", "px", "em" ],
+		adjustments = [ "px", "em" ],
+		container = jQuery("<div></div>")
+			.css({ position: "absolute", height: "50em", width: "50em" }),
+		animations = bases.length * adjustments.length;
+
+	expect( 2 * animations );
+
+	jQuery.each( bases, function( _, baseUnit ) {
+		jQuery.each( adjustments, function( _, adjustUnit ) {
+			var base = value + baseUnit,
+				adjust = { height: "+=2" + adjustUnit, width: "-=2" + adjustUnit },
+				elem = jQuery("<div></div>")
+					.appendTo( container.clone().appendTo("#qunit-fixture") )
+					.css({
+						position: "absolute",
+						height: base,
+						width: value + adjustUnit
+					}),
+				baseScale = elem[ 0 ].offsetHeight / value,
+				adjustScale = elem[ 0 ].offsetWidth / value;
+
+			elem.css( "width", base ).animate( adjust, 100, function() {
+				equal( this.offsetHeight, value * baseScale + 2 * adjustScale,
+					baseUnit + "+=" + adjustUnit );
+				equal( this.offsetWidth, value * baseScale - 2 * adjustScale,
+					baseUnit + "-=" + adjustUnit );
+
+				if ( --animations === 0 ) {
+					start();
+				}
+			});
+		});
+	});
+});
+
 test("animate negative height", function() {
 	expect(1);
 	stop();