deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changed the default easing function

Browse source
This commit is contained in:
Stefan Petre 2007-01-05 06:40:38 +00:00
parent 04b51d353a
commit 150262153b
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/fx/fx.js
View file

@ -498,11 +498,11 @@ jQuery.extend({
var n = t - this.startTime; var n = t - this.startTime;
// Figure out where in the animation we are and set the number // Figure out where in the animation we are and set the number
var p = n / z.o.duration; var p = n / z.o.duration;
//if the easing exists the use it else use default linear easing //if the easing function exists then use it else use default linear easing
if (jQuery.easing[z.o.easing]) if (jQuery.easing[z.o.easing])
z.now = jQuery.easing[z.o.easing](p, n, firstNum, (lastNum-firstNum), z.o.duration); z.now = jQuery.easing[z.o.easing](p, n, firstNum, (lastNum-firstNum), z.o.duration);
else else
z.now = jQuery.easingLinear(p, n, firstNum, (lastNum-firstNum), z.o.duration); z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;
// Perform the next step of the animation // Perform the next step of the animation
z.a(); z.a();
@ -511,11 +511,6 @@ jQuery.extend({
}, },
easingLinear : function(p, n, firstNum, delta, duration) {
var nm, m, a, s;
return ((-Math.cos(p*Math.PI)/2) + 0.5) * delta + firstNum;
},
/** /**
* *
* @param Integer p period step in animation * @param Integer p period step in animation
@ -526,7 +521,6 @@ jQuery.extend({
*/ */
easing : { easing : {
linear: function(p, n, firstNum, delta, duration) { linear: function(p, n, firstNum, delta, duration) {
var nm, m, a, s;
return ((-Math.cos(p*Math.PI)/2) + 0.5) * delta + firstNum; return ((-Math.cos(p*Math.PI)/2) + 0.5) * delta + firstNum;
}, },
@ -571,7 +565,7 @@ jQuery.extend({
}, },
elasticin: function(p, n, firstNum, delta, duration) { elasticin: function(p, n, firstNum, delta, duration) {
var nm, m, a, s; var a, s;
if (n == 0) if (n == 0)
return firstNum; return firstNum;
if ((n/=duration)==1) if ((n/=duration)==1)
@ -588,7 +582,7 @@ jQuery.extend({
}, },
elasticout:function(p, n, firstNum, delta, duration) { elasticout:function(p, n, firstNum, delta, duration) {
var nm, m, a, s; var a, s;
if (n==0) if (n==0)
return firstNum; return firstNum;
if ((n/=duration/2)==2) if ((n/=duration/2)==2)
@ -605,7 +599,7 @@ jQuery.extend({
}, },
elasticboth: function(p, n, firstNum, delta, duration) { elasticboth: function(p, n, firstNum, delta, duration) {
var nm, m, a, s; var a, s;
if (n==0) if (n==0)
return firstNum; return firstNum;
if ((n/=duration/2)==2) if ((n/=duration/2)==2)