Revert "Effects: Remove additional parameters of easings"

This reverts commit 41a04e59df5beac4ca61b3b5e3a6b078b6aee1ac.

diff --git a/src/effects/Tween.js b/src/effects/Tween.js
index 4e85e3c51207c0c0f62201cd517385311b6c6d11..33edf10f39af265c1378d7b4ed6a73fdb6b99415 100644 (file)
--- 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 ddd2e8d4336b49df6875016a3aad9983956be51b..42ab03789d10068985e7fe7b9b022277143c3d1c 100644 (file)
--- a/test/unit/tween.js
+++ b/test/unit/tween.js
@@ -217,7 +217,8 @@ QUnit.test( "jQuery.Tween - Plain Object", function( assert ) {
                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"
        );
@@ -280,7 +281,8 @@ QUnit.test( "jQuery.Tween - Element", function( assert ) {
                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(
                Math.floor( parseFloat( testElement.style.height ) ), Math.floor( eased ), "Set value"
        );