From: John Resig <jeresig@gmail.com>
Date: Tue, 18 Nov 2008 06:00:34 +0000 (+0000)
Subject: Made a mistake in the patch for #3618, landing fix.
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=d1f089952ec7640aa08d8a8dc5031a670165576a;p=jquery.git

Made a mistake in the patch for #3618, landing fix.
---

diff --git a/src/fx.js b/src/fx.js
index bc14d32..9397396 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -205,7 +205,7 @@ jQuery.extend({
 			complete: fn || !fn && easing ||
 				jQuery.isFunction( speed ) && speed,
 			duration: speed,
-			easing: fn && easing || jQuery.isFunction(easing) && easing
+			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
 		};
 
 		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :