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

Added a fix for easing problems (fall back to "linear" if swing doesn't exist) (bug #1212).

Browse source
This commit is contained in:
John Resig 2007-06-21 03:09:04 +00:00
parent 8b683b891f
commit 5bb0902c5e
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

@ -318,7 +318,7 @@ jQuery.fn.extend({
for ( var p in prop ) for ( var p in prop )
if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
return jQuery.isFunction(opt.complete) && opt.complete.apply(this); return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
this.curAnim = jQuery.extend({}, prop); this.curAnim = jQuery.extend({}, prop);
jQuery.each( prop, function(name, val){ jQuery.each( prop, function(name, val){
@ -364,7 +364,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 || "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 ?