git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d81dfbc
)
Made a mistake in the patch for #3618, landing fix.
author
John Resig
<jeresig@gmail.com>
Tue, 18 Nov 2008 06:00:34 +0000
(06:00 +0000)
committer
John Resig
<jeresig@gmail.com>
Tue, 18 Nov 2008 06:00:34 +0000
(06:00 +0000)
src/fx.js
patch
|
blob
|
history
diff --git
a/src/fx.js
b/src/fx.js
index
bc14d32
..
9397396
100644
(file)
--- 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 :