* @see slideToggle(String|Number,Function)
*/
slideDown: function(speed,callback){
- return this.animate({height: "show"}, speed, callback);
+ return this.filter(":hidden").animate({height: "show"}, speed, callback).end();
},
/**
* @see slideToggle(String|Number,Function)
*/
slideUp: function(speed,callback){
- return this.animate({height: "hide"}, speed, callback);
+ return this.filter(":visible").animate({height: "hide"}, speed, callback).end();
},
/**
* @see fadeTo(String|Number,Number,Function)
*/
fadeIn: function(speed, callback){
- return this.animate({opacity: "show"}, speed, callback);
+ return this.filter(":hidden").animate({opacity: "show"}, speed, callback).end();
},
/**
* @see fadeTo(String|Number,Number,Function)
*/
fadeOut: function(speed, callback){
- return this.animate({opacity: "hide"}, speed, callback);
+ return this.filter(":visible").animate({opacity: "hide"}, speed, callback).end();
},
/**
* @type jQuery
* @param Hash params A set of style attributes that you wish to animate, and to what end.
* @param String|Number speed (optional) A string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
- * @param String easing (optional) The name of the easing effect that you want to use (Plugin Required).
+ * @param String easing (optional) The name of the easing effect that you want to use (e.g. swing or linear). Defaults to "swing".
* @param Function callback (optional) A function to be executed whenever the animation completes.
* @cat Effects
*/
complete: fn || !fn && easing ||
jQuery.isFunction( speed ) && speed,
duration: speed,
- easing: fn && easing || easing && easing.constructor != Function && easing
+ easing: fn && easing || easing && easing.constructor != Function && easing || "swing"
};
opt.duration = (opt.duration && opt.duration.constructor == Number ?
return opt;
},
- easing: {},
+ easing: {
+ linear: function( p, n, firstNum, diff ) {
+ return firstNum + diff * p;
+ },
+ swing: function( p, n, firstNum, diff ) {
+ return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+ }
+ },
queue: {},
}
},
+ timers: [],
+
/*
* I originally wrote fx() as a clone of moo.fx and in the process
* of making it small in size the code became illegible to sane
z.now = from;
z.a();
- z.timer = setInterval(function(){
- z.step(from, to);
- }, 13);
+ jQuery.timers.push(function(){
+ return z.step(from, to);
+ });
+
+ if ( jQuery.timers.length == 1 ) {
+ var timer = setInterval(function(){
+ jQuery.timers = jQuery.grep( jQuery.timers, function(fn){
+ return fn();
+ });
+
+ if ( !jQuery.timers.length )
+ clearInterval( timer );
+ }, 13);
+ }
};
// Simple 'show' function
var t = (new Date()).getTime();
if (t > options.duration + z.startTime) {
- // Stop the timer
- clearInterval(z.timer);
- z.timer = null;
-
z.now = lastNum;
z.a();
if ( done && jQuery.isFunction( options.complete ) )
// Execute the complete function
options.complete.apply( elem );
+
+ return false;
} else {
var n = t - this.startTime;
// Figure out where in the animation we are and set the number
var p = n / options.duration;
- // If the easing function exists, then use it
- z.now = options.easing && jQuery.easing[options.easing] ?
- jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration) :
- // else use default linear easing
- ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;
+ // Perform the easing function, defaults to swing
+ z.now = jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration);
// Perform the next step of the animation
z.a();
}
+
+ return true;
};
}