git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a2482e5
)
Moving the easing check logic to the fx function, since Interface was overwriting...
author
John Resig
<jeresig@gmail.com>
Fri, 20 Jul 2007 20:05:20 +0000
(20:05 +0000)
committer
John Resig
<jeresig@gmail.com>
Fri, 20 Jul 2007 20:05:20 +0000
(20:05 +0000)
src/fx/fx.js
patch
|
blob
|
history
diff --git
a/src/fx/fx.js
b/src/fx/fx.js
index
d44fd82
..
3ad3dd5
100644
(file)
--- 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,
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 ?
};
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
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();
// Perform the next step of the animation
z.a();