X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffx.js;h=3fe936909971d8676dc80e2090239f5df75e5e9f;hb=61784e15816a35086388ebd5b98b56dea3535052;hp=8cb7b99a9ce7d492f63b71cbc571da10e947ebda;hpb=4add9fa9896be80364b2a97abc8bb5b5a6eb3e89;p=jquery.git

diff --git a/src/fx.js b/src/fx.js
index 8cb7b99..3fe9369 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -208,7 +208,7 @@ jQuery.extend({
 			easing: fn && easing || easing && easing.constructor != Function && easing
 		};
 
-		opt.duration = typeof opt.duration == 'number' ? opt.duration :
+		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration == 'number' ? opt.duration :
 			jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;
 
 		// Queueing