diff options
| -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(); |