aboutsummaryrefslogtreecommitdiffstats
path: root/src/fx.js
diff options
context:
space:
mode:
authorAriel Flesler <aflesler@gmail.com>2008-10-22 15:23:37 +0000
committerAriel Flesler <aflesler@gmail.com>2008-10-22 15:23:37 +0000
commit30751dd9f170e53e5feb6b92a64aa50970db69ef (patch)
tree37e523b3ef2b51d97debfbe4202da3920c5e986b /src/fx.js
parentad54d14ae55dd7e8063dc0c2c67346c4345d7259 (diff)
downloadjquery-30751dd9f170e53e5feb6b92a64aa50970db69ef.tar.gz
jquery-30751dd9f170e53e5feb6b92a64aa50970db69ef.zip
jquery fx: closes #3496. $.fx.off = true; turns off animations.
Diffstat (limited to 'src/fx.js')
-rw-r--r--src/fx.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fx.js b/src/fx.js
index 8cb7b99a9..3fe936909 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