X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;fp=src%2Ffx%2Ffx.js;h=acd51226a5bce153d7930101d2b96d77eff93151;hb=5bb0902c5ef4cf767a5940799826e57f2fcfdd34;hp=f53b2b29e5ed243c53f64af41c8b5e97c419316c;hpb=8b683b891f2cfd299c1d0708bb41ea26393ea417;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index f53b2b2..acd5122 100644
--- 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);
-		
+
 			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 ?