From 41a04e59df5beac4ca61b3b5e3a6b078b6aee1ac Mon Sep 17 00:00:00 2001 From: Thomas Tortorini Date: Sat, 27 Jun 2015 17:18:21 +0200 Subject: [PATCH] Effects: Remove additional parameters of easings (cherry-picked from b7a7dea95f84d6d8e5a8186d4fb09a762baf79bb) Fixes gh-2367 Closes gh-2376 --- src/effects/Tween.js | 15 +++++---------- test/unit/tween.js | 6 ++---- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/effects/Tween.js b/src/effects/Tween.js index 33edf10f3..4e85e3c51 100644 --- a/src/effects/Tween.js +++ b/src/effects/Tween.js @@ -27,17 +27,12 @@ Tween.prototype = { Tween.propHooks._default.get( this ); }, run: function( percent ) { - var eased, - hooks = Tween.propHooks[ this.prop ]; + var hooks = Tween.propHooks[ this.prop ]; - 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; + this.pos = this.options.duration ? + jQuery.easing[ this.easing ]( percent ) : + percent; + this.now = ( this.end - this.start ) * this.pos + 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 42ab03789..ddd2e8d43 100644 --- a/test/unit/tween.js +++ b/test/unit/tween.js @@ -217,8 +217,7 @@ QUnit.test( "jQuery.Tween - Plain Object", function( assert ) { tween.now, 90, "Calculated tween" ); - assert.ok( easingSpy.calledWith( 0.1, 0.1 * testOptions.duration, 0, 1, testOptions.duration ), - "...using jQuery.easing.linear with back-compat arguments" ); + assert.ok( easingSpy.calledWith( 0.1 ), "...using jQuery.easing.linear" ); assert.equal( testObject.test, 90, "Set value" ); @@ -281,8 +280,7 @@ QUnit.test( "jQuery.Tween - Element", function( assert ) { tween.now, eased, "Calculated tween" ); - assert.ok( easingSpy.calledWith( 0.1, 0.1 * testOptions.duration, 0, 1, testOptions.duration ), - "...using jQuery.easing.linear with back-compat arguments" ); + assert.ok( easingSpy.calledWith( 0.1 ), "...using jQuery.easing.linear" ); assert.equal( Math.floor( parseFloat( testElement.style.height ) ), Math.floor( eased ), "Set value" ); -- 2.39.5