X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=7c5ba445559f04b15ad95005300c8d97c7e9315f;hb=ad5539bab3e1d6806e054dd5b14cf341a675ded0;hp=f20cc468fb649841119eaa397ab91d34fa07b305;hpb=397be502f92abf14e97c247763d41d690561907a;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index f20cc46..7c5ba44 100644
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -1,337 +1,107 @@
 jQuery.fn.extend({
-
-	/**
-	 * 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
-	 * 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");
-	 *
-	 * @example $("p").show("slow",function(){
-	 *   alert("Animation Done.");
-	 * });
-	 *
-	 * @name show
-	 * @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.
-	 * @cat Effects
-	 * @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();
 	},
 	
-	/**
-	 * 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
-	 * 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");
-	 *
-	 * @example $("p").hide("slow",function(){
-	 *   alert("Animation Done.");
-	 * });
-	 *
-	 * @name hide
-	 * @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.
-	 * @cat Effects
-	 * @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
 	_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 ){
-		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" ]();
+				});
 	},
 	
-	/**
-	 * 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");
-	 *
-	 * @example $("p").slideDown("slow",function(){
-	 *   alert("Animation Done.");
-	 * });
-	 *
-	 * @name slideDown
-	 * @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.
-	 * @cat Effects
-	 * @see slideUp(String|Number,Function)
-	 * @see slideToggle(String|Number,Function)
-	 */
 	slideDown: function(speed,callback){
 		return this.animate({height: "show"}, speed, callback);
 	},
 	
-	/**
-	 * 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");
-	 *
-	 * @example $("p").slideUp("slow",function(){
-	 *   alert("Animation Done.");
-	 * });
-	 *
-	 * @name slideUp
-	 * @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.
-	 * @cat Effects
-	 * @see slideDown(String|Number,Function)
-	 * @see slideToggle(String|Number,Function)
-	 */
 	slideUp: function(speed,callback){
 		return this.animate({height: "hide"}, speed, callback);
 	},
 
-	/**
-	 * 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");
-	 *
-	 * @example $("p").slideToggle("slow",function(){
-	 *   alert("Animation Done.");
-	 * });
-	 *
-	 * @name slideToggle
-	 * @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.
-	 * @cat Effects
-	 * @see slideDown(String|Number,Function)
-	 * @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);
 	},
 	
-	/**
-	 * 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");
-	 *
-	 * @example $("p").fadeIn("slow",function(){
-	 *   alert("Animation Done.");
-	 * });
-	 *
-	 * @name fadeIn
-	 * @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.
-	 * @cat Effects
-	 * @see fadeOut(String|Number,Function)
-	 * @see fadeTo(String|Number,Number,Function)
-	 */
 	fadeIn: function(speed, callback){
 		return this.animate({opacity: "show"}, speed, callback);
 	},
 	
-	/**
-	 * 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");
-	 *
-	 * @example $("p").fadeOut("slow",function(){
-	 *   alert("Animation Done.");
-	 * });
-	 *
-	 * @name fadeOut
-	 * @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.
-	 * @cat Effects
-	 * @see fadeIn(String|Number,Function)
-	 * @see fadeTo(String|Number,Number,Function)
-	 */
 	fadeOut: function(speed, callback){
 		return this.animate({opacity: "hide"}, speed, callback);
 	},
 	
-	/**
-	 * 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);
-	 *
-	 * @example $("p").fadeTo("slow", 0.5, function(){
-	 *   alert("Animation Done.");
-	 * });
-	 *
-	 * @name fadeTo
-	 * @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 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.
-	 * @cat Effects
-	 * @see fadeIn(String|Number,Function)
-	 * @see fadeOut(String|Number,Function)
-	 */
 	fadeTo: function(speed,to,callback){
 		return this.animate({opacity: to}, speed, callback);
 	},
 	
-	/**
-	 * 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").
-	 *
-	 * 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
-	 * animation will be constructed for that property.
-	 *
-	 * @example $("p").animate({
-	 *   height: 'toggle', opacity: 'toggle'
-	 * }, "slow");
-	 *
-	 * @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 (Plugin Required).
-	 * @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;
 		});
 	},
 	
-	/**
-	 *
-	 * @private
-	 */
 	queue: function(type,fn){
 		if ( !fn ) {
 			fn = type;
@@ -350,6 +120,16 @@ jQuery.fn.extend({
 			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);
+		});
 	}
 
 });
@@ -379,7 +159,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: {},
 	
@@ -397,25 +184,13 @@ jQuery.extend({
 		}
 	},
 
-	/*
-	 * 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;
 		
-		// Store display property
-		var oldDisplay = jQuery.css(elem, "display");
-
-		// Make sure that nothing sneaks out
-		y.overflow = "hidden";
-
 		// Simple function for setting a style value
 		z.a = function(){
 			if ( options.step )
@@ -423,10 +198,16 @@ jQuery.extend({
 
 			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
-				y[prop] = parseInt(z.now) + "px";
-			
-			y.display = "block"; // Set display property to block for animation
+			else {
+				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";
+			}
 		};
 
 		// Figure out the maximum number to run to
@@ -436,6 +217,7 @@ jQuery.extend({
 
 		// 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();
 		};
@@ -446,9 +228,26 @@ jQuery.extend({
 			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
@@ -456,16 +255,20 @@ jQuery.extend({
 			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
@@ -473,36 +276,12 @@ jQuery.extend({
 			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
@@ -510,10 +289,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();
 
@@ -525,45 +300,45 @@ jQuery.extend({
 						done = false;
 
 				if ( done ) {
-					// Reset the overflow
-					y.overflow = "";
+					if ( options.display != null ) {
+						// Reset the overflow
+						y.overflow = options.overflow;
 					
-					// Reset the display
-					y.display = oldDisplay;
-					if (jQuery.css(elem, "display") == "none")
-						y.display = "block";
+						// Reset the display
+						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 ( 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 && 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;
 		};
 	
 	}