deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Moving the easing check logic to the fx function, since Interface was overwriting the speed function :-( (Fix for bug #1396).

Browse source
This commit is contained in:
John Resig 2007-07-20 20:05:20 +00:00
parent a2482e5e87
commit 9ffd93d53a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/fx/fx.js
View file

@ -376,7 +376,7 @@ jQuery.extend({
complete: fn || !fn && easing || complete: fn || !fn && easing ||
jQuery.isFunction( speed ) && speed, jQuery.isFunction( speed ) && speed,
duration: 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 ? opt.duration = (opt.duration && opt.duration.constructor == Number ?
@ -567,7 +567,7 @@ jQuery.extend({
var p = n / options.duration; var p = n / options.duration;
// Perform the easing function, defaults to swing // 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 // Perform the next step of the animation
z.a(); z.a();