X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=0c57ef450792c26d6ec3a6eaade8108bdc41ed0d;hb=1b9f4d3d2e1bc2dfd7572da77159fa01f9ab5d6e;hp=f67747fd049c214ac56ed9bfba8714d62d151ef1;hpb=027668047a65837daef59efcc5f7042303dd71c3;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index f67747f..0c57ef4 100644
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -143,7 +143,7 @@ jQuery.fn.extend({
 	 * @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();
 	},
 	
 	/**
@@ -168,7 +168,7 @@ jQuery.fn.extend({
 	 * @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();
 	},
 
 	/**
@@ -222,7 +222,7 @@ jQuery.fn.extend({
 	 * @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();
 	},
 	
 	/**
@@ -248,7 +248,7 @@ jQuery.fn.extend({
 	 * @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();
 	},
 	
 	/**
@@ -310,7 +310,7 @@ jQuery.fn.extend({
 	 * @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
 	 */
@@ -364,7 +364,7 @@ jQuery.extend({
 			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 ? 
@@ -382,7 +382,14 @@ jQuery.extend({
 		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: {},
 	
@@ -400,6 +407,8 @@ jQuery.extend({
 		}
 	},
 
+	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
@@ -452,9 +461,20 @@ jQuery.extend({
 			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
@@ -462,7 +482,7 @@ jQuery.extend({
 			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;
 
@@ -479,7 +499,7 @@ jQuery.extend({
 			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;
 
@@ -492,7 +512,7 @@ jQuery.extend({
 			if ( !elem.orig ) elem.orig = {};
 
 			// Remember where we started, so that we can go back to it later
-			elem.orig[prop] = this.style[prop];
+			elem.orig[prop] = jQuery.attr( elem.style, prop );
 
 			if(oldDisplay == "none")  {
 				options.show = true;
@@ -516,10 +536,6 @@ jQuery.extend({
 			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();
 
@@ -555,20 +571,21 @@ jQuery.extend({
 				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;
 		};
 	
 	}