X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=3ad3dd5141fd7ea61ec15f1bed4fcaf78da2ed22;hb=3c82f8fb4aed7b4e65e1dd9ed79718a155a7a492;hp=d44fd82de8219e6e012b91a65b1b81fc9e3634f5;hpb=4577cd4b16b633a7015d02ff229898b58831dd18;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index d44fd82..3ad3dd5 100644
--- 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,
-			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 ? 
@@ -567,7 +567,7 @@ jQuery.extend({
 				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();