X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffx%2Ffx.js;h=d44fd82de8219e6e012b91a65b1b81fc9e3634f5;hb=4577cd4b16b633a7015d02ff229898b58831dd18;hp=f53b2b29e5ed243c53f64af41c8b5e97c419316c;hpb=8b683b891f2cfd299c1d0708bb41ea26393ea417;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index f53b2b2..d44fd82 100644
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -315,10 +315,22 @@ jQuery.fn.extend({
 				opt = jQuery.speed(speed, easing, callback),
 				self = this;
 			
-			for ( var p in prop )
+			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);
 			
 			jQuery.each( prop, function(name, val){
@@ -364,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 ? 
@@ -422,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 )
@@ -440,7 +443,10 @@ jQuery.extend({
 				jQuery.attr(y, "opacity", z.now); // Let attr handle opacity
 			else {
 				y[prop] = parseInt(z.now) + "px";
-				y.display = "block"; // Set display property to block for animation
+
+				// Set display property to block for height/width animations
+				if ( prop == "height" || prop == "width" )
+					y.display = "block";
 			}
 		};
 
@@ -529,12 +535,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";
 					}