aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkobrigo <kobrigo@hotmail.com>2010-06-16 04:38:19 -0700
committerScott González <scott.gonzalez@gmail.com>2010-07-16 10:02:06 -0400
commit141748788b034e97337ee7d9d137153c445097fd (patch)
treed47a42b4d1509ede34d0f58476e96eb69b0cc824
parentbf947d17567f971d52e88013609caf17f0a96d22 (diff)
downloadjquery-ui-141748788b034e97337ee7d9d137153c445097fd.tar.gz
jquery-ui-141748788b034e97337ee7d9d137153c445097fd.zip
Fixed argument shifting for effects. Fixes #5731 - hide and show called with ommiting the options in parameters does not call the callback.
-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 || {};