From: Oleg Gaidarenko <markelog@gmail.com>
Date: Wed, 11 Nov 2015 15:56:05 +0000 (+0300)
Subject: Revert "Effects: Remove additional parameters of easings"
X-Git-Tag: 2.2.0~64
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=82bb2ae719dfe3d7336e12263e30acaff22edb9e;p=jquery.git

Revert "Effects: Remove additional parameters of easings"

This reverts commit b7a7dea95f84d6d8e5a8186d4fb09a762baf79bb.
---

diff --git a/src/effects/Tween.js b/src/effects/Tween.js
index 47f15a947..d26ddd918 100644
--- a/src/effects/Tween.js
+++ b/src/effects/Tween.js
@@ -27,12 +27,17 @@ Tween.prototype = {
 			Tween.propHooks._default.get( this );
 	},
 	run: function( percent ) {
-		var hooks = Tween.propHooks[ this.prop ];
+		var eased,
+			hooks = Tween.propHooks[ this.prop ];
 
-		this.pos = this.options.duration ?
-			jQuery.easing[ this.easing ]( percent ) :
-			percent;
-		this.now = ( this.end - this.start ) * this.pos + this.start;
+		if ( this.options.duration ) {
+			this.pos = eased = jQuery.easing[ this.easing ](
+				percent, this.options.duration * percent, 0, 1, this.options.duration
+			);
+		} else {
+			this.pos = eased = percent;
+		}
+		this.now = ( this.end - this.start ) * eased + this.start;
 
 		if ( this.options.step ) {
 			this.options.step.call( this.elem, this.now, this );
diff --git a/test/unit/tween.js b/test/unit/tween.js
index f66aa37b6..28fcfad25 100644
--- a/test/unit/tween.js
+++ b/test/unit/tween.js
@@ -160,7 +160,8 @@ QUnit.test( "jQuery.Tween - Plain Object", function( assert ) {
 
 	assert.equal( tween.now, 90, "Calculated tween" );
 
-	assert.ok( easingSpy.calledWith( 0.1 ), "...using jQuery.easing.linear" );
+	assert.ok( easingSpy.calledWith( 0.1, 0.1 * testOptions.duration, 0, 1, testOptions.duration ),
+		"...using jQuery.easing.linear with back-compat arguments" );
 	assert.equal( testObject.test, 90, "Set value" );
 
 	tween.run( 1 );
@@ -199,7 +200,10 @@ QUnit.test( "jQuery.Tween - Element", function( assert ) {
 	eased = 100 - ( jQuery.easing.swing( 0.1 ) * 100 );
 	assert.equal( tween.now, eased, "Calculated tween" );
 
-	assert.ok( easingSpy.calledWith( 0.1 ), "...using jQuery.easing.linear" );
+	assert.ok(
+		easingSpy.calledWith( 0.1, 0.1 * testOptions.duration, 0, 1, testOptions.duration ),
+		"...using jQuery.easing.linear with back-compat arguments"
+	);
 	assert.equal(
 		parseFloat( testElement.style.height ).toFixed( 2 ),
 		eased.toFixed( 2 ), "Set value"