Commit 9ffd93d5 authored by John Resig's avatar John Resig

Moving the easing check logic to the fx function, since Interface was...

Moving the easing check logic to the fx function, since Interface was overwriting the speed function :-( (Fix for bug #1396).
parent a2482e5e
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment