library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Effects: Remove additional parameters of easings"

Browse Source 
This reverts commit b7a7dea95f.

Fixes #3064
This commit is contained in:
Oleg Gaidarenko 2016-04-27 23:21:56 +03:00
parent 7f1e59343b
commit d6e99d9b5e
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/effects/Tween.js
View File

@ -29,12 +29,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 );

8
test/unit/tween.js
View File

@ -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"