diff options
author | John Resig <jeresig@gmail.com> | 2007-07-20 20:05:20 +0000 |
---|---|---|
committer | John Resig <jeresig@gmail.com> | 2007-07-20 20:05:20 +0000 |
commit | 9ffd93d53a44ad6dd56646b2e15740a49c1b4f08 (patch) | |
tree | 7ae3c907d8309c898931ffc007445db7f4bc69fa | |
parent | a2482e5e87558edb2be67fd6e7369bb62168fde9 (diff) | |
download | jquery-9ffd93d53a44ad6dd56646b2e15740a49c1b4f08.tar.gz jquery-9ffd93d53a44ad6dd56646b2e15740a49c1b4f08.zip |
Moving the easing check logic to the fx function, since Interface was overwriting the speed function :-( (Fix for bug #1396).
-rw-r--r-- | src/fx/fx.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fx/fx.js b/src/fx/fx.js index d44fd82de..3ad3dd514 100644 --- a/src/fx/fx.js +++ b/src/fx/fx.js @@ -376,7 +376,7 @@ jQuery.extend({ complete: fn || !fn && easing || jQuery.isFunction( speed ) && speed, duration: speed, - easing: fn && easing || easing && easing.constructor != Function && easing || (jQuery.easing.swing ? "swing" : "linear") + easing: fn && easing || easing && easing.constructor != Function && easing }; opt.duration = (opt.duration && opt.duration.constructor == Number ? @@ -567,7 +567,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 || (jQuery.easing.swing ? "swing" : "linear")](p, n, firstNum, (lastNum-firstNum), options.duration); // Perform the next step of the animation z.a(); |