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

Simplified the easing options - we now provide "swing" and "linear" (defaulting to "swing"). This is in response to #928.

Browse source
This commit is contained in:
John Resig 2007-03-24 03:12:12 +00:00
parent fde2867fce
commit 1b9f4d3d2e
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/fx/fx.js
View file

@ -310,7 +310,7 @@ jQuery.fn.extend({
* @type jQuery * @type jQuery
* @param Hash params A set of style attributes that you wish to animate, and to what end. * @param Hash params A set of style attributes that you wish to animate, and to what end.
* @param String|Number speed (optional) A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000). * @param String|Number speed (optional) A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
* @param String easing (optional) The name of the easing effect that you want to use (Plugin Required). * @param String easing (optional) The name of the easing effect that you want to use (e.g. swing or linear). Defaults to "swing".
* @param Function callback (optional) A function to be executed whenever the animation completes. * @param Function callback (optional) A function to be executed whenever the animation completes.
* @cat Effects * @cat Effects
*/ */
@ -364,7 +364,7 @@ jQuery.extend({
complete: fn || !fn && easing || complete: fn || !fn && easing ||
jQuery.isFunction( speed ) && speed, jQuery.isFunction( speed ) && speed,
duration: speed, duration: speed,
easing: fn && easing || easing && easing.constructor != Function && easing easing: fn && easing || easing && easing.constructor != Function && easing || "swing"
}; };
opt.duration = (opt.duration && opt.duration.constructor == Number ? opt.duration = (opt.duration && opt.duration.constructor == Number ?
@ -382,7 +382,14 @@ jQuery.extend({
return opt; return opt;
}, },
easing: {}, easing: {
linear: function( p, n, firstNum, diff ) {
return firstNum + diff * p;
},
swing: function( p, n, firstNum, diff ) {
return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
}
},
queue: {}, queue: {},
@ -571,11 +578,8 @@ jQuery.extend({
// 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 / options.duration; var p = n / options.duration;
// If the easing function exists, then use it // Perform the easing function, defaults to swing
z.now = options.easing && jQuery.easing[options.easing] ? z.now = jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration);
jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration) :
// else use default linear easing
((-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();