Skip to content

J
jquery
Commit d1f08995 authored by John Resig's avatar John Resig
Browse files
Options

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

parent d81dfbcc
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
src/fx.js
View file @ d1f08995
...@@ -205,7 +205,7 @@ jQuery.extend({ ...@@ -205,7 +205,7 @@ jQuery.extend({
complete: fn || !fn && easing || complete: fn || !fn && easing ||
jQuery.isFunction( speed ) && speed, jQuery.isFunction( speed ) && speed,
duration: 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 : opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment