X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=4c38413ef374b5fee88b1fa43fba83b6a845ae17;hb=6f0c9a5fd751d590be07e890758b8229e630413d;hp=ceeb6d13f5b6d7288325cb935ee961d87ab0824e;hpb=9b5363b9eb197515e31589894c945dfd70b8b93b;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index ceeb6d1..4c38413 100644
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -110,9 +110,13 @@ jQuery.fn.extend({
 	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);
+			fn ?
+				this.animate({
+					height: "toggle", width: "toggle", opacity: "toggle"
+				}, fn, fn2) :
+				this.each(function(){
+					jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
+				});
 	},
 	
 	/**
@@ -295,28 +299,39 @@ jQuery.fn.extend({
 	 * @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).
+	 * @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 "swing" and "linear" are 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 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");
+			var hidden = jQuery(this).is(":hidden"),
+				opt = jQuery.speed(speed, easing, callback),
+				self = this;
 			
-			for ( var p in prop )
-				if ( prop[p] == "hide" && hidden ||
-					prop[p] == "show" && !hidden )
-						return;
-		
+			for ( var p in 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);
-			var opt = jQuery.speed(speed, easing, callback);
-			var self = this;
 			
 			jQuery.each( prop, function(name, val){
 				var e = new jQuery.fx( self, opt, name );
@@ -361,7 +376,7 @@ jQuery.extend({
 			complete: fn || !fn && easing || 
 				jQuery.isFunction( speed ) && speed,
 			duration: speed,
-			easing: fn && easing || easing && easing.constructor != Function && easing || "swing"
+			easing: fn && easing || easing && easing.constructor != Function && easing || (jQuery.easing.swing ? "swing" : "linear")
 		};
 
 		opt.duration = (opt.duration && opt.duration.constructor == Number ? 
@@ -419,15 +434,6 @@ jQuery.extend({
 		// The styles
 		var y = elem.style;
 		
-		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 ( options.step )
@@ -526,12 +532,12 @@ jQuery.extend({
 						done = false;
 
 				if ( done ) {
-					if ( oldDisplay != null ) {
+					if ( options.display != null ) {
 						// Reset the overflow
-						y.overflow = oldOverflow;
+						y.overflow = options.overflow;
 					
 						// Reset the display
-						y.display = oldDisplay;
+						y.display = options.display;
 						if ( jQuery.css(elem, "display") == "none" )
 							y.display = "block";
 					}
@@ -558,7 +564,7 @@ jQuery.extend({
 				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);
+				z.now = jQuery.easing[options.easing](p, n, firstNum, (lastNum-firstNum), options.duration);
 
 				// Perform the next step of the animation
 				z.a();