jQuery.fn.extend({
- // overwrite the old show method
- _show: jQuery.fn.show,
+ /**
+ * Displays each of the set of matched elements if they are hidden.
+ *
+ * @example $("p").show()
+ * @before <p style="display: none">Hello</p>
+ * @result [ <p style="display: block">Hello</p> ]
+ *
+ * @name show
+ * @type jQuery
+ * @cat Effects
+ */
/**
* Show all matched elements using a graceful animation and firing an
* @type jQuery
* @param String|Number speed 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 Function callback (optional) A function to be executed whenever the animation completes.
- * @param String transition (optional) Transition effect
- * @cat Effects/Animations
+ * @cat Effects
* @see hide(String|Number,Function)
*/
- show: function(speed,callback, transition){
- return speed ? this.animate({
- height: "show", width: "show", opacity: "show"
- }, speed, callback, transition) : this._show();
+ show: function(speed,callback){
+ return speed ?
+ this.animate({
+ height: "show", width: "show", opacity: "show"
+ }, speed, callback) :
+
+ this.filter(":hidden").each(function(){
+ this.style.display = this.oldblock ? this.oldblock : "";
+ if ( jQuery.css(this,"display") == "none" )
+ this.style.display = "block";
+ }).end();
},
- // Overwrite the old hide method
- _hide: jQuery.fn.hide,
+ /**
+ * Hides each of the set of matched elements if they are shown.
+ *
+ * @example $("p").hide()
+ * @before <p>Hello</p>
+ * @result [ <p style="display: none">Hello</p> ]
+ *
+ * @name hide
+ * @type jQuery
+ * @cat Effects
+ */
/**
* Hide all matched elements using a graceful animation and firing an
* @type jQuery
* @param String|Number speed 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 Function callback (optional) A function to be executed whenever the animation completes.
- * @param String transition (optional) Transition effect
- * @cat Effects/Animations
+ * @cat Effects
* @see show(String|Number,Function)
*/
- hide: function(speed,callback, transition){
- return speed ? this.animate({
- height: "hide", width: "hide", opacity: "hide"
- }, speed, callback, transition) : this._hide();
+ hide: function(speed,callback){
+ return speed ?
+ this.animate({
+ height: "hide", width: "hide", opacity: "hide"
+ }, speed, callback) :
+
+ this.filter(":visible").each(function(){
+ this.oldblock = this.oldblock || jQuery.css(this,"display");
+ if ( this.oldblock == "none" )
+ this.oldblock = "block";
+ this.style.display = "none";
+ }).end();
+ },
+
+ // Save the old toggle function
+ _toggle: jQuery.fn.toggle,
+
+ /**
+ * Toggles each of the set of matched elements. If they are shown,
+ * toggle makes them hidden. If they are hidden, toggle
+ * makes them shown.
+ *
+ * @example $("p").toggle()
+ * @before <p>Hello</p><p style="display: none">Hello Again</p>
+ * @result [ <p style="display: none">Hello</p>, <p style="display: block">Hello Again</p> ]
+ *
+ * @name toggle
+ * @type jQuery
+ * @cat Effects
+ */
+ toggle: function( fn, fn2 ){
+ return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
+ this._toggle( fn, fn2 ) :
+ this.animate({
+ height: "toggle", width: "toggle", opacity: "toggle"
+ }, fn, fn2);
},
/**
* @type jQuery
* @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 Function callback (optional) A function to be executed whenever the animation completes.
- * @param String transition (optional) Transition effect
- * @cat Effects/Animations
+ * @cat Effects
* @see slideUp(String|Number,Function)
* @see slideToggle(String|Number,Function)
*/
- slideDown: function(speed,callback, transition){
- return this.animate({height: "show"}, speed, callback, transition);
+ slideDown: function(speed,callback){
+ return this.animate({height: "show"}, speed, callback);
},
/**
* @type jQuery
* @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 Function callback (optional) A function to be executed whenever the animation completes.
- * @param String transition (optional) Transition effect
- * @cat Effects/Animations
+ * @cat Effects
* @see slideDown(String|Number,Function)
* @see slideToggle(String|Number,Function)
*/
- slideUp: function(speed,callback, transition){
- return this.animate({height: "hide"}, speed, callback, transition);
+ slideUp: function(speed,callback){
+ return this.animate({height: "hide"}, speed, callback);
},
/**
* @type jQuery
* @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 Function callback (optional) A function to be executed whenever the animation completes.
- * @param String transition (optional) Transition effect
- * @cat Effects/Animations
+ * @cat Effects
* @see slideDown(String|Number,Function)
* @see slideUp(String|Number,Function)
*/
- slideToggle: function(speed, callback, transition){
- return this.each(function(){
- var state = jQuery(this).is(":hidden") ? "show" : "hide";
- jQuery(this).animate({height: state}, speed, callback, transition);
- });
+ slideToggle: function(speed, callback){
+ return this.animate({height: "toggle"}, speed, callback);
},
/**
* @type jQuery
* @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 Function callback (optional) A function to be executed whenever the animation completes.
- * @param String transition (optional) Transition effect
- * @cat Effects/Animations
+ * @cat Effects
* @see fadeOut(String|Number,Function)
* @see fadeTo(String|Number,Number,Function)
*/
- fadeIn: function(speed, callback, transition){
- return this.animate({opacity: "show"}, speed, callback, transition);
+ fadeIn: function(speed, callback){
+ return this.animate({opacity: "show"}, speed, callback);
},
/**
* @type jQuery
* @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 Function callback (optional) A function to be executed whenever the animation completes.
- * @param String transition (optional) Transition effect
- * @cat Effects/Animations
+ * @cat Effects
* @see fadeIn(String|Number,Function)
* @see fadeTo(String|Number,Number,Function)
*/
- fadeOut: function(speed, callback, transition){
- return this.animate({opacity: "hide"}, speed, callback, transition);
+ fadeOut: function(speed, callback){
+ return this.animate({opacity: "hide"}, speed, callback);
},
/**
* @param String|Number speed 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 Number opacity The opacity to fade to (a number from 0 to 1).
* @param Function callback (optional) A function to be executed whenever the animation completes.
- * @param String transition (optional) Transition effect
- * @cat Effects/Animations
+ * @cat Effects
* @see fadeIn(String|Number,Function)
* @see fadeOut(String|Number,Function)
*/
- fadeTo: function(speed,to,callback, transition){
- return this.animate({opacity: to}, speed, callback, transition);
+ fadeTo: function(speed,to,callback){
+ return this.animate({opacity: to}, 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({
* left: 50, opacity: 'show'
* }, 500);
*
+ * @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).
+ *
* @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 (e.g. swing or linear). Defaults to "swing".
* @param Function callback (optional) A function to be executed whenever the animation completes.
- * @param String transition (optional) Transition effect
- * @cat Effects/Animations
+ * @cat Effects
*/
- animate: function(prop,speed,callback, transition) {
+ 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, jQuery.speed(speed,callback), p, transition );
- 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 );
+ });
});
},
jQuery.extend({
- speed: function(s,o) {
- o = o || {};
-
- if ( o.constructor == Function )
- o = { complete: o };
-
- var ss = { slow: 600, fast: 200 };
- o.duration = (s && s.constructor == Number ? s : ss[s]) || 400;
+ speed: function(speed, easing, fn) {
+ var opt = speed && speed.constructor == Object ? speed : {
+ complete: fn || !fn && easing ||
+ jQuery.isFunction( speed ) && speed,
+ duration: speed,
+ easing: fn && easing || easing && easing.constructor != Function && easing || "swing"
+ };
+
+ opt.duration = (opt.duration && opt.duration.constructor == Number ?
+ opt.duration :
+ { slow: 600, fast: 200 }[opt.duration]) || 400;
// Queueing
- o.oldComplete = o.complete;
- o.complete = function(){
+ opt.old = opt.complete;
+ opt.complete = function(){
jQuery.dequeue(this, "fx");
- if ( o.oldComplete && o.oldComplete.constructor == Function )
- o.oldComplete.apply( this );
+ if ( jQuery.isFunction( opt.old ) )
+ opt.old.apply( this );
};
- return o;
+ return opt;
+ },
+
+ 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
* people. You've been warned.
*/
- fx: function( elem, options, prop, transition ){
+ fx: function( elem, options, prop ){
var z = this;
- // The users options
- z.o = {
- duration: options.duration || 400,
- complete: options.complete,
- step: options.step,
- transition : /easein|easeout|easeboth|bouncein|bounceout|bounceboth|elasticin|elasticout|elasticboth/.test(transition) ? transition : 'original'
- };
-
- // The element
- z.el = elem;
-
// The styles
- var y = z.el.style;
+ var y = elem.style;
- // Store display property
- var oldDisplay = jQuery.css(z.el, '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.max = function(){
- return parseFloat( jQuery.css(z.el,prop) );
+ return parseFloat( jQuery.css(elem,prop) );
};
// Get the current size
z.cur = function(){
- var r = parseFloat( jQuery.curCSS(z.el, 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);
+ 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
z.show = function(){
- if ( !z.el.orig ) z.el.orig = {};
+ if ( !elem.orig ) elem.orig = {};
// Remember where we started, so that we can go back to it later
- z.el.orig[prop] = this.cur();
+ elem.orig[prop] = jQuery.attr( elem.style, prop );
- z.o.show = true;
+ options.show = true;
// Begin the animation
- z.custom(0, z.el.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
z.hide = function(){
- if ( !z.el.orig ) z.el.orig = {};
+ if ( !elem.orig ) elem.orig = {};
// Remember where we started, so that we can go back to it later
- z.el.orig[prop] = this.cur();
+ elem.orig[prop] = jQuery.attr( elem.style, prop );
- z.o.hide = true;
+ options.hide = true;
// Begin the animation
- z.custom(z.el.orig[prop], 0);
- };
-
- //Simple 'toggle' function
- z.toggle = function() {
- if ( !z.el.orig ) z.el.orig = {};
-
- // Remember where we started, so that we can go back to it later
- z.el.orig[prop] = this.cur();
-
- if(oldDisplay == 'none') {
- z.o.show = true;
-
- // Stupid IE, look what you made me do
- if ( prop != "opacity" )
- y[prop] = "1px";
-
- // Begin the animation
- z.custom(0, z.el.orig[prop]);
- } else {
- z.o.hide = true;
-
- // Begin the animation
- z.custom(z.el.orig[prop], 0);
- }
+ z.custom(this.cur(), 0);
};
// Each step of an animation
z.step = function(firstNum, lastNum){
var t = (new Date()).getTime();
- if (t > z.o.duration + z.startTime) {
- // Stop the timer
- clearInterval(z.timer);
- z.timer = null;
-
+ if (t > options.duration + z.startTime) {
z.now = lastNum;
z.a();
- if (z.el.curAnim) z.el.curAnim[ prop ] = true;
+ if (elem.curAnim) elem.curAnim[ prop ] = true;
var done = true;
- for ( var i in z.el.curAnim )
- if ( z.el.curAnim[i] !== true )
+ for ( var i in elem.curAnim )
+ if ( elem.curAnim[i] !== true )
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(z.el, '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 ( z.o.hide )
- y.display = 'none';
+ if ( options.hide )
+ y.display = "none";
// Reset the properties, if the item has been hidden or shown
- if ( z.o.hide || z.o.show )
- for ( var p in z.el.curAnim )
- if (p == "opacity")
- jQuery.attr(y, p, z.el.orig[p]);
- else
- y[p] = '';
+ if ( options.hide || options.show )
+ for ( var p in elem.curAnim )
+ jQuery.attr(y, p, elem.orig[p]);
}
// If a callback was provided, execute it
- if( done && z.o.complete && z.o.complete.constructor == Function )
+ if ( done && jQuery.isFunction( options.complete ) )
// Execute the complete function
- z.o.complete.apply( z.el );
+ 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 / z.o.duration;
- //z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;
- z.now = jQuery.transitions(p, n, firstNum, (lastNum-firstNum), z.o.duration, z.o.transition);
+ var p = n / options.duration;
+
+ // 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;
};
- },
-
- transitions : function(p, n, firstNum, delta, duration, type) {
- var nm, m, a, s;
- if (type == 'original') {
- return ((-Math.cos(p*Math.PI)/2) + 0.5) * delta + firstNum;
- }
- if (type == 'easein') {
- return delta*(n/=duration)*n*n + firstNum;
- }
- if (type == 'easeout') {
- return -delta * ((n=n/duration-1)*n*n*n - 1) + firstNum;
- }
- if (type == 'easeboth') {
- if ((n/=duration/2) < 1)
- return delta/2*n*n*n*n + firstNum;
- return -delta/2 * ((n-=2)*n*n*n - 2) + firstNum;
- }
- if (type == 'easeboth') {
- if ((n/=duration/2) < 1)
- return delta/2*n*n*n*n + firstNum;
- return -delta/2 * ((n-=2)*n*n*n - 2) + firstNum;
- }
- if (type == 'bounceout') {
- if ((n/=duration) < (1/2.75)) {
- return delta*(7.5625*n*n) + firstNum;
- } else if (n < (2/2.75)) {
- return delta*(7.5625*(n-=(1.5/2.75))*n + .75) + firstNum;
- } else if (n < (2.5/2.75)) {
- return delta*(7.5625*(n-=(2.25/2.75))*n + .9375) + firstNum;
- } else {
- return delta*(7.5625*(n-=(2.625/2.75))*n + .984375) + firstNum;
- }
- }
- if (type == 'bouncein') {
- return delta - jQuery.transitions (p, duration - n, 0, delta, duration, 'bounceout') + firstNum;
- }
- if (type == 'bounceboth') {
- if (n < duration/2) return jQuery.transitions(p, n*2, 0, delta, duration, 'bouncein') * .5 + firstNum;
- return jQuery.transitions(p, n*2-duration, 0, delta, duration, 'bounceout') * .5 + delta*.5 + firstNum;
- }
- if (type == 'elasticin') {
- if (n == 0)
- return firstNum;
- if ((n/=duration)==1)
- return firstNum+delta;
- a = delta * 0.3;
- p=duration*.3;
- if (a < Math.abs(delta)) {
- a=delta;
- s=p/4;
- } else {
- s = p/(2*Math.PI) * Math.asin (delta/a);
- }
- return -(a*Math.pow(2,10*(n-=1)) * Math.sin( (n*duration-s)*(2*Math.PI)/p )) + firstNum;
- }
- if (type == 'elasticout') {
- if (n==0)
- return firstNum;
- if ((n/=duration/2)==2)
- return firstNum + delta;
- a = delta * 0.3;
- p=duration*.3;
- if (a < Math.abs(delta)){
- a = delta;
- s=p/4;
- } else {
- s = p/(2*Math.PI) * Math.asin (delta/a);
- }
- return a*Math.pow(2,-10*n) * Math.sin( (n*duration-s)*(2*Math.PI)/p ) + delta + firstNum;
- }
- if (type == 'elasticboth') {
- if (n==0)
- return firstNum;
- if ((n/=duration/2)==2)
- return firstNum + delta;
- a = delta * 0.3;
- p=duration*.3;
- if (a < Math.abs(delta)){
- a = delta;
- s=p/4;
- } else {
- s = p/(2*Math.PI) * Math.asin (delta/a);
- }
- if (n < 1) {
- return -.5*(a*Math.pow(2,10*(n-=1)) * Math.sin( (n*duration-s)*(2*Math.PI)/p )) + firstNum;
- }
- return a*Math.pow(2,-10*(n-=1)) * Math.sin( (n*duration-s)*(2*Math.PI)/p )*.5 + delta + firstNum;
- }
}
-
});
git.asbjorn.biz / jquery.git / blobdiff