From 41a04e59df5beac4ca61b3b5e3a6b078b6aee1ac Mon Sep 17 00:00:00 2001 From: Thomas Tortorini Date: Sat, 27 Jun 2015 17:18:21 +0200 Subject: Effects: Remove additional parameters of easings (cherry-picked from b7a7dea95f84d6d8e5a8186d4fb09a762baf79bb) Fixes gh-2367 Closes gh-2376 --- src/effects/Tween.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src') 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 ); -- cgit v1.2.3