Skip to content
Permalink
Browse files

effects: fixed various problems with order of callbacks (i.e. show('d…

…rop', 500) wasn't working) (additionally fixes #3912)
  • Loading branch information
Paul Bakaus
Paul Bakaus committed Jan 29, 2009
1 parent 9439da6 commit c2d272259fc89845a314c41d43e4c5aa27a93166
Showing with 16 additions and 7 deletions.
  1. +16 −7 ui/effects.core.js
@@ -132,6 +132,18 @@ $.extend($.effects, {
}
});


function _normalizeArguments(a, m) {

var o = a[1] && a[1].constructor == Object ? a[1] : {}; if(m) o.mode = m;
var speed = a[1] && a[1].constructor != Object ? a[1] : o.duration; //either comes from options.duration or the second argument
speed = $.fx.off ? 0 : typeof speed === "number" ? speed : $.fx.speeds[speed] || $.fx.speeds._default;
var callback = o.callback || ( $.isFunction(a[2]) && a[2] ) || ( $.isFunction(a[3]) && a[3] );

return [a[0], o, speed, callback];

}

//Extend the methods of jQuery
$.fn.extend({

@@ -145,33 +157,30 @@ $.fn.extend({

// New effect methods
effect: function(fx, options, speed, callback) {
return $.effects[fx] ? $.effects[fx].call(this, {method: fx, options: options || {}, duration: speed, callback: callback }) : null;
return $.effects[fx] ? $.effects[fx].call(this, {method: fx, options: options, duration: speed, callback: callback }) : null;
},

show: function() {
if(!arguments[0] || (arguments[0].constructor == Number || (/(slow|normal|fast)/).test(arguments[0])))
return this._show.apply(this, arguments);
else {
var o = arguments[1] || {}; o['mode'] = 'show';
return this.effect.apply(this, [arguments[0], o, arguments[2] || o.duration, arguments[3] || o.callback]);
return this.effect.apply(this, _normalizeArguments(arguments, 'show'));
}
},

hide: function() {
if(!arguments[0] || (arguments[0].constructor == Number || (/(slow|normal|fast)/).test(arguments[0])))
return this._hide.apply(this, arguments);
else {
var o = arguments[1] || {}; o['mode'] = 'hide';
return this.effect.apply(this, [arguments[0], o, arguments[2] || o.duration, arguments[3] || o.callback]);
return this.effect.apply(this, _normalizeArguments(arguments, 'hide'));
}
},

toggle: function(){
if(!arguments[0] || (arguments[0].constructor == Number || (/(slow|normal|fast)/).test(arguments[0])) || (arguments[0].constructor == Function))
return this.__toggle.apply(this, arguments);
else {
var o = arguments[1] || {}; o['mode'] = 'toggle';
return this.effect.apply(this, [arguments[0], o, arguments[2] || o.duration, arguments[3] || o.callback]);
return this.effect.apply(this, _normalizeArguments(arguments, 'toggle'));
}
},

0 comments on commit c2d2722

Please sign in to comment.
You can’t perform that action at this time.