aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-02-06 10:02:58 -0500
committerDave Methvin <dave.methvin@gmail.com>2012-02-09 21:37:54 -0500
commit8618487c536f7128222e3d0fefca933cc3e94298 (patch)
tree6412461ffc101cb4ab5ab76f66cc3f16b72f1b53 /src
parentbf7a4df22abcea10cf8f97eb31b5fa989fb4daf5 (diff)
downloadjquery-8618487c536f7128222e3d0fefca933cc3e94298.tar.gz
jquery-8618487c536f7128222e3d0fefca933cc3e94298.zip
Easing: Only use the state to calculate the value. Fixes #11284 - Simplify easings to only rely on the state.
Diffstat (limited to 'src')
-rw-r--r--src/effects.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/effects.js b/src/effects.js
index 346438174..7d0c2a8ab 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -400,11 +400,11 @@ jQuery.extend({
},
easing: {
- linear: function( p, n, firstNum, diff ) {
- return firstNum + diff * p;
+ linear: function( p ) {
+ return p;
},
- swing: function( p, n, firstNum, diff ) {
- return ( ( -Math.cos( p*Math.PI ) / 2 ) + 0.5 ) * diff + firstNum;
+ swing: function( p ) {
+ return ( -Math.cos( p*Math.PI ) / 2 ) + 0.5;
}
},