Skip to content
Permalink
Browse files

Added a fix for easing problems (fall back to "linear" if swing doesn…

…'t exist) (bug #1212).
  • Loading branch information
jeresig committed Jun 21, 2007
1 parent 8b683b8 commit 5bb0902c5ef4cf767a5940799826e57f2fcfdd34
Showing with 2 additions and 2 deletions.
  1. +2 −2 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);

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,
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 ?

0 comments on commit 5bb0902

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