Skip to content
Permalink
Browse files

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

… overwriting the speed function :-( (Fix for bug #1396).
  • Loading branch information
jeresig committed Jul 20, 2007
1 parent a2482e5 commit 9ffd93d53a44ad6dd56646b2e15740a49c1b4f08
Showing with 2 additions and 2 deletions.
  1. +2 −2 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();

0 comments on commit 9ffd93d

Please sign in to comment.
You can’t perform that action at this time.