* @see hide(String|Number,Function)
*/
show: function(speed,callback){
- var hidden = this.filter(":hidden");
- speed ?
- hidden.animate({
+ return speed ?
+ this.animate({
height: "show", width: "show", opacity: "show"
}, speed, callback) :
- hidden.each(function(){
+ this.filter(":hidden").each(function(){
this.style.display = this.oldblock ? this.oldblock : "";
if ( jQuery.css(this,"display") == "none" )
this.style.display = "block";
- });
- return this;
+ }).end();
},
/**
* @see show(String|Number,Function)
*/
hide: function(speed,callback){
- var visible = this.filter(":visible");
- speed ?
- visible.animate({
+ return speed ?
+ this.animate({
height: "hide", width: "hide", opacity: "hide"
}, speed, callback) :
- visible.each(function(){
+ this.filter(":visible").each(function(){
this.oldblock = this.oldblock || jQuery.css(this,"display");
if ( this.oldblock == "none" )
this.oldblock = "block";
this.style.display = "none";
- });
- return this;
+ }).end();
},
// Save the old toggle function
* @cat Effects
*/
toggle: function( fn, fn2 ){
- var args = arguments;
return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
this._toggle( fn, fn2 ) :
- this.each(function(){
- jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]
- .apply( jQuery(this), args );
- });
+ fn ?
+ this.animate({
+ height: "toggle", width: "toggle", opacity: "toggle"
+ }, fn, fn2) :
+ this.each(function(){
+ jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
+ });
},
/**
* @see slideUp(String|Number,Function)
*/
slideToggle: function(speed, callback){
- return this.each(function(){
- var state = jQuery(this).is(":hidden") ? "show" : "hide";
- jQuery(this).animate({height: state}, speed, callback);
- });
+ return this.animate({height: "toggle"}, speed, callback);
},
/**
* @example $("p").animate({
* opacity: 'show'
* }, "slow", "easein");
- * @desc An example of using an 'easing' function to provide a different style of animation. This will only work if you have a plugin that provides this easing function (Only 'linear' is provided by default, with jQuery).
+ * @desc An example of using an 'easing' function to provide a different style of animation. This will only work if you have a plugin that provides this easing function (Only "swing" and "linear" are provided by default, with jQuery).
*
* @name animate
* @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
*/
animate: function( prop, speed, easing, callback ) {
return this.queue(function(){
-
- this.curAnim = jQuery.extend({}, prop);
- var opt = jQuery.speed(speed, easing, callback);
+ var hidden = jQuery(this).is(":hidden"),
+ opt = jQuery.speed(speed, easing, callback),
+ self = this;
for ( var p in prop ) {
- var e = new jQuery.fx( this, opt, p );
- if ( prop[p].constructor == Number )
- e.custom( e.cur(), prop[p] );
- else
- e[ prop[p] ]( prop );
+ if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
+ return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
+
+ if ( p == "height" || p == "width" ) {
+ // Store display property
+ opt.display = jQuery.css(this, "display");
+
+ // Make sure that nothing sneaks out
+ opt.overflow = this.style.overflow;
+ }
}
+
+ if ( opt.overflow != null )
+ this.style.overflow = "hidden";
+
+ this.curAnim = jQuery.extend({}, prop);
+ jQuery.each( prop, function(name, val){
+ var e = new jQuery.fx( self, opt, name );
+ if ( val.constructor == Number )
+ e.custom( e.cur() || 0, val );
+ else
+ e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+ });
+
+ // For JS strict compliance
+ return true;
});
},
if ( this.queue[type].length == 1 )
fn.apply(this);
});
+ },
+
+ stop: function(){
+ var timers = jQuery.timers;
+
+ return this.each(function(){
+ for ( var i = 0; i < timers.length; i++ )
+ if ( timers[i].elem == this )
+ timers.splice(i--, 1);
+ });
}
});
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: {},
}
},
- /*
- * 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
- * people. You've been warned.
- */
-
- fx: function( elem, options, prop ){
+ timers: [],
- var z = this;
+ fx: function( elem, options, prop ){
- // The styles
- var y = elem.style;
+ var z = this, y = elem.style,
+ isprop = elem[prop] != null && y[prop] == null;
- if ( prop == "height" || prop == "width" ) {
- // Store display property
- var oldDisplay = jQuery.css(elem, "display");
-
- // Make sure that nothing sneaks out
- var oldOverflow = y.overflow;
- y.overflow = "hidden";
- }
-
// Simple function for setting a style value
z.a = function(){
if ( options.step )
if ( prop == "opacity" )
jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
else {
- y[prop] = parseInt(z.now) + "px";
- y.display = "block"; // Set display property to block for animation
+ if ( isprop )
+ elem[prop] = parseInt(z.now);
+ else
+ y[prop] = parseInt(z.now) + "px";
+
+ // Set display property to block for height/width animations
+ if ( prop == "height" || prop == "width" )
+ y.display = "block";
}
};
// Get the current size
z.cur = function(){
+ if ( isprop ) return elem[prop];
var r = parseFloat( jQuery.curCSS(elem, prop) );
return r && r > -10000 ? r : z.max();
};
z.now = from;
z.a();
- z.timer = setInterval(function(){
- z.step(from, to);
- }, 13);
+ function t(){
+ return z.step(from, to);
+ }
+
+ t.elem = elem;
+
+ jQuery.timers.push(t);
+
+ if ( jQuery.timers.length == 1 ) {
+ var timer = setInterval(function(){
+ var timers = jQuery.timers;
+
+ for ( var i = 0; i < timers.length; i++ )
+ if ( !timers[i]() )
+ timers.splice(i--, 1);
+
+ if ( !timers.length )
+ clearInterval( timer );
+ }, 13);
+ }
};
// Simple 'show' function
if ( !elem.orig ) elem.orig = {};
// Remember where we started, so that we can go back to it later
- elem.orig[prop] = elem.style[prop];
+ elem.orig[prop] = jQuery.attr( elem.style, prop );
options.show = true;
// Begin the animation
z.custom(0, this.cur());
- // Stupid IE, look what you made me do
+ // Make sure that we start at a small width/height to avoid any
+ // flash of content
if ( prop != "opacity" )
y[prop] = "1px";
+
+ // Start by showing the element
+ jQuery(elem).show();
};
// Simple 'hide' function
if ( !elem.orig ) elem.orig = {};
// Remember where we started, so that we can go back to it later
- elem.orig[prop] = elem.style[prop];
+ elem.orig[prop] = jQuery.attr( elem.style, prop );
options.hide = true;
// Begin the animation
z.custom(this.cur(), 0);
};
-
- //Simple 'toggle' function
- z.toggle = function() {
- if ( !elem.orig ) elem.orig = {};
-
- // Remember where we started, so that we can go back to it later
- elem.orig[prop] = this.style[prop];
-
- if(oldDisplay == "none") {
- options.show = true;
-
- // Stupid IE, look what you made me do
- if ( prop != "opacity" )
- y[prop] = "1px";
-
- // Begin the animation
- z.custom(0, this.cur());
- } else {
- options.hide = true;
-
- // Begin the animation
- z.custom(this.cur(), 0);
- }
- };
// Each step of an animation
z.step = function(firstNum, lastNum){
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();
done = false;
if ( done ) {
- if ( oldDisplay ) {
+ if ( options.display != null ) {
// Reset the overflow
- y.overflow = oldOverflow;
+ y.overflow = options.overflow;
// Reset the display
- y.display = oldDisplay;
- if (jQuery.css(elem, "display") == "none")
+ y.display = options.display;
+ if ( jQuery.css(elem, "display") == "none" )
y.display = "block";
}
// Hide the element if the "hide" operation was done
- if ( options.hide )
+ if ( options.hide )
y.display = "none";
// Reset the properties, if the item has been hidden or shown
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 || (jQuery.easing.swing ? "swing" : "linear")](p, n, firstNum, (lastNum-firstNum), options.duration);
// Perform the next step of the animation
z.a();
}
+
+ return true;
};
}