aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkobrigo <kobrigo@hotmail.com>2010-06-16 04:38:19 -0700
committerjzaefferer <joern.zaefferer@gmail.com>2010-07-16 16:09:23 +0200
commit4be0942af0d0a73541148899fbb2e0c406795c79 (patch)
treec274b10719cecb4a4b067fcd3b9087d004123632
parent06f721b74f94272baf5da96133e961f5600f5a90 (diff)
downloadjquery-ui-4be0942af0d0a73541148899fbb2e0c406795c79.tar.gz
jquery-ui-4be0942af0d0a73541148899fbb2e0c406795c79.zip
argument shifting is not done correctly when the options argument is not supplied. the result is that the callback is not called. this fixes Ticket #5731 foooo
-rw-r--r--ui/jquery.effects.core.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js
index f4fca9f93..801b57e4c 100644
--- a/ui/jquery.effects.core.js
+++ b/ui/jquery.effects.core.js
@@ -418,15 +418,15 @@ function _normalizeArguments(effect, options, speed, callback) {
speed = null;
options = {};
}
- if ($.isFunction(speed)) {
- callback = speed;
- speed = null;
- }
- if (typeof options == 'number' || $.fx.speeds[options]) {
+ if (typeof options == 'number' || $.fx.speeds[options]) {
callback = speed;
speed = options;
options = {};
}
+ if ($.isFunction(speed)) {
+ callback = speed;
+ speed = null;
+ }
options = options || {};