X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=be8aee87dc2319670c77974b51e71dffaccf1fbb;hb=783f589fbf005a6a3211bff20e3e8aeb1ea0ac22;hp=7c2218e143487aa00f1695ed7a3e59390014841a;hpb=7cc550727c4e0bcd93c5d435f0799f568fc74dfa;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index 7c2218e..be8aee8 100644
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -4,285 +4,223 @@ jQuery.fn.extend({
 	_show: jQuery.fn.show,
 	
 	/**
-	 * Show all matched elements using a graceful animation.
+	 * Show all matched elements using a graceful animation and firing an
+	 * optional callback after completion.
+	 *
 	 * The height, width, and opacity of each of the matched elements 
 	 * are changed dynamically according to the specified speed.
 	 *
 	 * @example $("p").show("slow");
 	 *
-	 * @name show
-	 * @type jQuery
-	 * @param Object 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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Show all matched elements using a graceful animation and firing a callback
-	 * function after completion.
-	 * The height, width, and opacity of each of the matched elements 
-	 * are changed dynamically according to the specified speed.
-	 *
 	 * @example $("p").show("slow",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name show
 	 * @type jQuery
-	 * @param Object 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 A function to be executed whenever the animation completes.
+	 * @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 easing (optional) easing effect
 	 * @cat Effects/Animations
+	 * @see hide(String|Number,Function)
 	 */
-	show: function(speed,callback){
+	show: function(speed,callback, easing){
 		return speed ? this.animate({
 			height: "show", width: "show", opacity: "show"
-		}, speed, callback) : this._show();
+		}, speed, callback, easing) : this._show();
 	},
 	
 	// Overwrite the old hide method
 	_hide: jQuery.fn.hide,
 	
 	/**
-	 * Hide all matched elements using a graceful animation.
+	 * Hide all matched elements using a graceful animation and firing an
+	 * optional callback after completion.
+	 *
 	 * The height, width, and opacity of each of the matched elements 
 	 * are changed dynamically according to the specified speed.
 	 *
 	 * @example $("p").hide("slow");
 	 *
-	 * @name hide
-	 * @type jQuery
-	 * @param Object 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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Hide all matched elements using a graceful animation and firing a callback
-	 * function after completion.
-	 * The height, width, and opacity of each of the matched elements 
-	 * are changed dynamically according to the specified speed.
-	 *
 	 * @example $("p").hide("slow",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name hide
 	 * @type jQuery
-	 * @param Object 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 A function to be executed whenever the animation completes.
+	 * @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 easing (optional) easing effect
 	 * @cat Effects/Animations
+	 * @see show(String|Number,Function)
 	 */
-	hide: function(speed,callback){
+	hide: function(speed,callback, easing){
 		return speed ? this.animate({
 			height: "hide", width: "hide", opacity: "hide"
-		}, speed, callback) : this._hide();
+		}, speed, callback, easing) : this._hide();
 	},
 	
 	/**
-	 * Reveal all matched elements by adjusting their height.
+	 * Reveal all matched elements by adjusting their height and firing an
+	 * optional callback after completion.
+	 *
 	 * Only the height is adjusted for this animation, causing all matched
 	 * elements to be revealed in a "sliding" manner.
 	 *
 	 * @example $("p").slideDown("slow");
 	 *
-	 * @name slideDown
-	 * @type jQuery
-	 * @param Object 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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Reveal all matched elements by adjusting their height and firing a callback
-	 * function after completion.
-	 * Only the height is adjusted for this animation, causing all matched
-	 * elements to be revealed in a "sliding" manner.
-	 *
 	 * @example $("p").slideDown("slow",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name slideDown
 	 * @type jQuery
-	 * @param Object 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 A function to be executed whenever the animation completes.
+	 * @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 easing (optional) easing effect
 	 * @cat Effects/Animations
+	 * @see slideUp(String|Number,Function)
+	 * @see slideToggle(String|Number,Function)
 	 */
-	slideDown: function(speed,callback){
-		return this.animate({height: "show"}, speed, callback);
+	slideDown: function(speed,callback, easing){
+		return this.animate({height: "show"}, speed, callback, easing);
 	},
 	
 	/**
-	 * Hide all matched elements by adjusting their height.
+	 * Hide all matched elements by adjusting their height and firing an
+	 * optional callback after completion.
+	 *
 	 * Only the height is adjusted for this animation, causing all matched
 	 * elements to be hidden in a "sliding" manner.
 	 *
 	 * @example $("p").slideUp("slow");
 	 *
-	 * @name slideUp
-	 * @type jQuery
-	 * @param Object 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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Hide all matched elements by adjusting their height and firing a callback
-	 * function after completion.
-	 * Only the height is adjusted for this animation, causing all matched
-	 * elements to be hidden in a "sliding" manner.
-	 *
 	 * @example $("p").slideUp("slow",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name slideUp
 	 * @type jQuery
-	 * @param Object 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 A function to be executed whenever the animation completes.
+	 * @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 easing (optional) easing effect
 	 * @cat Effects/Animations
+	 * @see slideDown(String|Number,Function)
+	 * @see slideToggle(String|Number,Function)
 	 */
-	slideUp: function(speed,callback){
-		return this.animate({height: "hide"}, speed, callback);
+	slideUp: function(speed,callback, easing){
+		return this.animate({height: "hide"}, speed, callback, easing);
 	},
 
 	/**
-	 * Toggle the visibility of all matched elements by adjusting their height.
+	 * Toggle the visibility of all matched elements by adjusting their height and firing an
+	 * optional callback after completion.
+	 *
 	 * Only the height is adjusted for this animation, causing all matched
 	 * elements to be hidden in a "sliding" manner.
 	 *
 	 * @example $("p").slideToggle("slow");
 	 *
-	 * @name slideToggle
-	 * @type jQuery
-	 * @param Object 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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Toggle the visibility of all matched elements by adjusting their height
-	 * and firing a callback function after completion.
-	 * Only the height is adjusted for this animation, causing all matched
-	 * elements to be hidden in a "sliding" manner.
-	 *
 	 * @example $("p").slideToggle("slow",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name slideToggle
 	 * @type jQuery
-	 * @param Object 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 A function to be executed whenever the animation completes.
+	 * @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 easing (optional) easing effect
 	 * @cat Effects/Animations
+	 * @see slideDown(String|Number,Function)
+	 * @see slideUp(String|Number,Function)
 	 */
-	slideToggle: function(speed,callback){
+	slideToggle: function(speed, callback, easing){
 		return this.each(function(){
 			var state = jQuery(this).is(":hidden") ? "show" : "hide";
-			jQuery(this).animate({height: state}, speed, callback);
+			jQuery(this).animate({height: state}, speed, callback, easing);
 		});
 	},
 	
 	/**
-	 * Fade in all matched elements by adjusting their opacity.
+	 * Fade in all matched elements by adjusting their opacity and firing an
+	 * optional callback after completion.
+	 *
 	 * Only the opacity is adjusted for this animation, meaning that
 	 * all of the matched elements should already have some form of height
 	 * and width associated with them.
 	 *
 	 * @example $("p").fadeIn("slow");
 	 *
-	 * @name fadeIn
-	 * @type jQuery
-	 * @param Object 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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Fade in all matched elements by adjusting their opacity and firing a 
-	 * callback function after completion.
-	 * Only the opacity is adjusted for this animation, meaning that
-	 * all of the matched elements should already have some form of height
-	 * and width associated with them.
-	 *
 	 * @example $("p").fadeIn("slow",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name fadeIn
 	 * @type jQuery
-	 * @param Object 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 A function to be executed whenever the animation completes.
+	 * @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 easing (optional) easing effect
 	 * @cat Effects/Animations
+	 * @see fadeOut(String|Number,Function)
+	 * @see fadeTo(String|Number,Number,Function)
 	 */
-	fadeIn: function(speed,callback){
-		return this.animate({opacity: "show"}, speed, callback);
+	fadeIn: function(speed, callback, easing){
+		return this.animate({opacity: "show"}, speed, callback, easing);
 	},
 	
 	/**
-	 * Fade out all matched elements by adjusting their opacity.
+	 * Fade out all matched elements by adjusting their opacity and firing an
+	 * optional callback after completion.
+	 *
 	 * Only the opacity is adjusted for this animation, meaning that
 	 * all of the matched elements should already have some form of height
 	 * and width associated with them.
 	 *
 	 * @example $("p").fadeOut("slow");
 	 *
-	 * @name fadeOut
-	 * @type jQuery
-	 * @param Object 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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Fade out all matched elements by adjusting their opacity and firing a 
-	 * callback function after completion.
-	 * Only the opacity is adjusted for this animation, meaning that
-	 * all of the matched elements should already have some form of height
-	 * and width associated with them.
-	 *
 	 * @example $("p").fadeOut("slow",function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name fadeOut
 	 * @type jQuery
-	 * @param Object 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 A function to be executed whenever the animation completes.
+	 * @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 easing (optional) easing effect
 	 * @cat Effects/Animations
+	 * @see fadeIn(String|Number,Function)
+	 * @see fadeTo(String|Number,Number,Function)
 	 */
-	fadeOut: function(speed,callback){
-		return this.animate({opacity: "hide"}, speed, callback);
+	fadeOut: function(speed, callback, easing){
+		return this.animate({opacity: "hide"}, speed, callback, easing);
 	},
 	
 	/**
-	 * Fade the opacity of all matched elements to a specified opacity.
+	 * Fade the opacity of all matched elements to a specified opacity and firing an
+	 * optional callback after completion.
+	 *
 	 * Only the opacity is adjusted for this animation, meaning that
 	 * all of the matched elements should already have some form of height
 	 * and width associated with them.
 	 *
 	 * @example $("p").fadeTo("slow", 0.5);
 	 *
-	 * @name fadeTo
-	 * @type jQuery
-	 * @param Object 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).
-	 * @cat Effects/Animations
-	 */
-	 
-	/**
-	 * Fade the opacity of all matched elements to a specified opacity and 
-	 * firing a callback function after completion.
-	 * Only the opacity is adjusted for this animation, meaning that
-	 * all of the matched elements should already have some form of height
-	 * and width associated with them.
-	 *
 	 * @example $("p").fadeTo("slow", 0.5, function(){
 	 *   alert("Animation Done.");
 	 * });
 	 *
 	 * @name fadeTo
 	 * @type jQuery
-	 * @param Object 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 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 A function to be executed whenever the animation completes.
+	 * @param Function callback (optional) A function to be executed whenever the animation completes.
+	 * @param String easing (optional) easing effect
 	 * @cat Effects/Animations
+	 * @see fadeIn(String|Number,Function)
+	 * @see fadeOut(String|Number,Function)
 	 */
-	fadeTo: function(speed,to,callback){
-		return this.animate({opacity: to}, speed, callback);
+	fadeTo: function(speed,to,callback, easing){
+		return this.animate({opacity: to}, speed, callback, easing);
 	},
 	
 	/**
@@ -308,17 +246,18 @@ jQuery.fn.extend({
 	 * @name animate
 	 * @type jQuery
 	 * @param Hash params A set of style attributes that you wish to animate, and to what end.
-	 * @param Object 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 A function to be executed whenever the animation completes.
+	 * @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 easing (optional) easing effect
 	 * @cat Effects/Animations
 	 */
-	animate: function(prop,speed,callback) {
+	animate: function(prop,speed,callback, easing) {
 		return this.queue(function(){
 		
 			this.curAnim = jQuery.extend({}, prop);
 			
 			for ( var p in prop ) {
-				var e = new jQuery.fx( this, jQuery.speed(speed,callback), p );
+				var e = new jQuery.fx( this, jQuery.speed(speed,callback), p, easing );
 				if ( prop[p].constructor == Number )
 					e.custom( e.cur(), prop[p] );
 				else
@@ -398,7 +337,7 @@ jQuery.extend({
 	 * people. You've been warned.
 	 */
 	
-	fx: function( elem, options, prop ){
+	fx: function( elem, options, prop, easing ){
 
 		var z = this;
 
@@ -406,9 +345,10 @@ jQuery.extend({
 		z.o = {
 			duration: options.duration || 400,
 			complete: options.complete,
-			step: options.step
+			step: options.step,
+			easing : easing || 'linear'
 		};
-
+		
 		// The element
 		z.el = elem;
 
@@ -484,6 +424,30 @@ jQuery.extend({
 			// 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);
+			}		
+		};
 
 		// Each step of an animation
 		z.step = function(firstNum, lastNum){
@@ -497,7 +461,7 @@ jQuery.extend({
 				z.now = lastNum;
 				z.a();
 
-				z.el.curAnim[ prop ] = true;
+				if (z.el.curAnim) z.el.curAnim[ prop ] = true;
 
 				var done = true;
 				for ( var i in z.el.curAnim )
@@ -531,15 +495,134 @@ jQuery.extend({
 					// Execute the complete function
 					z.o.complete.apply( z.el );
 			} else {
+				var n = t - this.startTime;
 				// Figure out where in the animation we are and set the number
-				var p = (t - this.startTime) / z.o.duration;
-				z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;
+				var p = n / z.o.duration;
+				//if the easing exists the use it else use default linear easing
+				if (jQuery.easing[z.o.easing])
+					z.now = jQuery.easing[z.o.easing](p, n,  firstNum, (lastNum-firstNum), z.o.duration);
+				else 
+					z.now = jQuery.easingLinear(p, n,  firstNum, (lastNum-firstNum), z.o.duration);
 
 				// Perform the next step of the animation
 				z.a();
 			}
 		};
 	
+	},
+	
+	easingLinear :  function(p, n, firstNum, delta, duration) {
+			var nm, m, a, s;
+			return ((-Math.cos(p*Math.PI)/2) + 0.5) * delta + firstNum;
+	},
+	
+	/**
+	 *
+	 * @param Integer p period step in animation
+	 * @param Integer n current time
+	 * @param Mixed firstNum begin value
+	 * @param Mixed delta change in
+	 * @param Integer duration duration
+	 */
+	easing :  {
+		linear: function(p, n, firstNum, delta, duration) {
+			var nm, m, a, s;
+			return ((-Math.cos(p*Math.PI)/2) + 0.5) * delta + firstNum;
+		},
+		
+		easein: function(p, n, firstNum, delta, duration) {
+			return delta*(n/=duration)*n*n + firstNum;
+		},
+		
+		easeou: function(p, n, firstNum, delta, duration) {
+			return -delta * ((n=n/duration-1)*n*n*n - 1) + firstNum;
+		},
+		
+		easeboth: function(p, n, firstNum, delta, duration) {
+			if ((n/=duration/2) < 1)
+				return delta/2*n*n*n*n + firstNum;
+				return -delta/2 * ((n-=2)*n*n*n - 2) + firstNum;
+		},
+		
+		bounceout: function(p, n, firstNum, delta, duration) {
+			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;
+			}
+		},
+		
+		bouncein: function(p, n, firstNum, delta, duration) {
+			if (jQuery.easing.bounceout)
+				return delta - jQuery.easing.bounceout (p, duration - n, 0, delta, duration) + firstNum;
+			return firstNum + delta;
+		},
+		
+		bounceboth: function(p, n, firstNum, delta, duration) {
+			if (jQuery.easing.bouncein && jQuery.easing.bounceout)
+				if (n < duration/2)
+					return jQuery.easing.bouncein(p, n*2, 0, delta, duration) * .5 + firstNum;
+				return jQuery.easing.bounceout(p, n*2-duration, 0, delta, duration) * .5 + delta*.5 + firstNum; 
+			return firstNum + delta;
+		},
+		
+		elasticin: function(p, n, firstNum, delta, duration) {
+			var nm, m, a, s;
+   			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; 
+		},
+		
+		elasticout:function(p, n, firstNum, delta, duration) {
+			var nm, m, a, s;
+			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;
+		},
+		
+		elasticboth: function(p, n, firstNum, delta, duration) {
+			var nm, m, a, s;
+			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; 
+		}
 	}
 
-});
+});
\ No newline at end of file