From: John Resig <jeresig@gmail.com>
Date: Fri, 20 Jul 2007 20:05:20 +0000 (+0000)
Subject: Moving the easing check logic to the fx function, since Interface was overwriting... 
X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=9ffd93d53a44ad6dd56646b2e15740a49c1b4f08

Moving the easing check logic to the fx function, since Interface was overwriting the speed function :-( (Fix for bug #1396).
---

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();