From 0c3d73ebaea1f80422a115ed3d9a1f2a133d28cf Mon Sep 17 00:00:00 2001 From: shalecraig Date: Thu, 25 Oct 2012 02:09:10 -0700 Subject: [PATCH] Wow, Uglify.js is stupid. --- src/fx.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/fx.js b/src/fx.js index fe80b3ea8..434112696 100644 --- a/src/fx.js +++ b/src/fx.js @@ -48,11 +48,10 @@ $.fn.animate = function(properties, duration, ease, callback){ if ($.isObject(duration)) ease = duration.easing, callback = duration.complete, duration = duration.duration + + if (duration && typeof duration != 'number') + duration = ($.fx.speeds[duration] || $.fx.speeds._default) if (duration) - if (typeof duration == 'number') - duration = duration - else - duration = ($.fx.speeds[duration] || $.fx.speeds._default) duration /= 1000 return this.anim(properties, duration, ease, callback) }