X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=dd5407c1d8cbdf973696911c65d649eb3fc0809f;hb=f7ea17060fcaf6cd14a03343ec97f77367f5022a;hp=ceeb6d13f5b6d7288325cb935ee961d87ab0824e;hpb=9b5363b9eb197515e31589894c945dfd70b8b93b;p=jquery.git diff --git a/src/fx/fx.js b/src/fx/fx.js index ceeb6d1..dd5407c 100644 --- a/src/fx/fx.js +++ b/src/fx/fx.js @@ -295,13 +295,13 @@ jQuery.fn.extend({ * @example $("p").animate({ * opacity: 'show' * }, "slow", "easein"); - * @desc An example of using an 'easing' function to provide a different style of animation. This will only work if you have a plugin that provides this easing function (Only 'linear' is provided by default, with jQuery). + * @desc An example of using an 'easing' function to provide a different style of animation. This will only work if you have a plugin that provides this easing function (Only "swing" and "linear" are provided by default, with jQuery). * * @name animate * @type jQuery * @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 easing (optional) The name of the easing effect that you want to use (e.g. swing or linear). Defaults to "swing". + * @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. * @cat Effects */ @@ -558,7 +558,7 @@ jQuery.extend({ var p = n / options.duration; // Perform the easing function, defaults to swing - z.now = jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration); + z.now = jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration); // Perform the next step of the animation z.a();