* @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 ){
- return fn ?
+ 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), arguments );
- });
+ this.animate({
+ height: "toggle", width: "toggle", opacity: "toggle"
+ }, fn, fn2);
},
/**
* @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);
},
/**
},
/**
- * A function for making your own, custom, animations. The key aspect of
+ * A function for making your own, custom animations. The key aspect of
* this function is the object of style properties that will be animated,
* and to what end. Each key within the object represents a style property
* that will also be animated (for example: "height", "top", or "opacity").
*
+ * Note that properties should be specified using camel case
+ * eg. marginLeft instead of margin-left.
+ *
* The value associated with the key represents to what end the property
* will be animated. If a number is provided as the value, then the style
* property will be transitioned from its current state to that new number.
- * Oterwise if the string "hide", "show", or "toggle" is provided, a default
+ * Otherwise if the string "hide", "show", or "toggle" is provided, a default
* animation will be constructed for that property.
*
* @example $("p").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(){
+ var hidden = jQuery(this).is(":hidden");
+
+ for ( var p in prop )
+ if ( prop[p] == "hide" && hidden ||
+ prop[p] == "show" && !hidden )
+ return;
this.curAnim = jQuery.extend({}, prop);
var opt = jQuery.speed(speed, easing, callback);
+ var 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] );
+ jQuery.each( prop, function(name, val){
+ var e = new jQuery.fx( self, opt, name );
+ if ( val.constructor == Number )
+ e.custom( e.cur(), val );
else
- e[ prop[p] ]( prop );
- }
-
+ e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+ });
});
},
speed: function(speed, easing, fn) {
var opt = speed && speed.constructor == Object ? speed : {
complete: fn || !fn && easing ||
- speed && speed.constructor == Function && speed,
+ 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 ?
{ slow: 600, fast: 200 }[opt.duration]) || 400;
// Queueing
- opt.oldComplete = opt.complete;
+ opt.old = opt.complete;
opt.complete = function(){
jQuery.dequeue(this, "fx");
- if ( opt.oldComplete && opt.oldComplete.constructor == Function )
- opt.oldComplete.apply( this );
+ if ( jQuery.isFunction( opt.old ) )
+ opt.old.apply( this );
};
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
// The styles
var y = elem.style;
- // Store display property
- var oldDisplay = jQuery.css(elem, 'display');
- // Set display property to block for animation
- y.display = "block";
- // Make sure that nothing sneaks out
- y.overflow = "hidden";
+ 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 ( prop == "opacity" )
jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
- else if ( parseInt(z.now) ) // My hate for IE will never die
+ else {
y[prop] = parseInt(z.now) + "px";
+ y.display = "block"; // Set display property to block for animation
+ }
};
// Figure out the maximum number to run to
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(){
+ 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] = this.cur();
+ elem.orig[prop] = jQuery.attr( elem.style, prop );
options.show = true;
// Begin the animation
- z.custom(0, elem.orig[prop]);
+ 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] = this.cur();
+ elem.orig[prop] = jQuery.attr( elem.style, prop );
options.hide = true;
// Begin the animation
- z.custom(elem.orig[prop], 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.cur();
-
- 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, elem.orig[prop]);
- } else {
- options.hide = true;
-
- // Begin the animation
- z.custom(elem.orig[prop], 0);
- }
+ z.custom(this.cur(), 0);
};
// Each step of an animation
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 ) {
- // Reset the overflow
- y.overflow = '';
+ if ( oldDisplay != null ) {
+ // Reset the overflow
+ y.overflow = oldOverflow;
- // Reset the display
- y.display = oldDisplay;
- if (jQuery.css(elem, 'display') == 'none')
- y.display = 'block';
+ // Reset the display
+ y.display = oldDisplay;
+ if ( jQuery.css(elem, "display") == "none" )
+ y.display = "block";
+ }
// Hide the element if the "hide" operation was done
- if ( options.hide )
- y.display = 'none';
+ if ( options.hide )
+ y.display = "none";
// Reset the properties, if the item has been hidden or shown
if ( options.hide || options.show )
for ( var p in elem.curAnim )
- if (p == "opacity")
- jQuery.attr(y, p, elem.orig[p]);
- else
- y[p] = '';
+ jQuery.attr(y, p, elem.orig[p]);
}
// If a callback was provided, execute it
- if ( done && options.complete && options.complete.constructor == Function )
+ 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;
};
}
git.asbjorn.biz / jquery.git / blobdiff