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

d1f08995 · John Resig · d81dfbcc · d1f08995
Commit d1f08995 authored Nov 18, 2008 by John Resig
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

fx.js src/fx.js +1 -1

No files found.
--- 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 :