git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for #1322
[jquery.git]
/
src
/
fx
/
fx.js
diff --git
a/src/fx/fx.js
b/src/fx/fx.js
index
f53b2b2
..
acd5122
100644
(file)
--- a/
src/fx/fx.js
+++ b/
src/fx/fx.js
@@
-318,7
+318,7
@@
jQuery.fn.extend({
for ( var p in prop )
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
for ( var p in prop )
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
-
+
this.curAnim = jQuery.extend({}, prop);
jQuery.each( prop, function(name, val){
this.curAnim = jQuery.extend({}, prop);
jQuery.each( prop, function(name, val){
@@
-364,7
+364,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 || "swing"
+ easing: fn && easing || easing && easing.constructor != Function && easing || (jQuery.easing.swing ? "swing" : "linear")
};
opt.duration = (opt.duration && opt.duration.constructor == Number ?
};
opt.duration = (opt.duration && opt.duration.constructor == Number ?