diff options
| -rw-r--r-- | src/effects/Tween.js | 15 | ||||
| -rw-r--r-- | test/unit/tween.js | 8 |
2 files changed, 7 insertions, 16 deletions
diff --git a/src/effects/Tween.js b/src/effects/Tween.js index d26ddd918..47f15a947 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 28fcfad25..f66aa37b6 100644 --- a/test/unit/tween.js +++ b/test/unit/tween.js @@ -160,8 +160,7 @@ QUnit.test( "jQuery.Tween - Plain Object", function( assert ) { assert.equal( 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" ); tween.run( 1 ); @@ -200,10 +199,7 @@ 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, 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( parseFloat( testElement.style.height ).toFixed( 2 ), eased.toFixed( 2 ), "Set value" |