X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=4c38413ef374b5fee88b1fa43fba83b6a845ae17;hb=28a80202b3d41ed69f529f91c2f5bc4e929d51fa;hp=acd51226a5bce153d7930101d2b96d77eff93151;hpb=5bb0902c5ef4cf767a5940799826e57f2fcfdd34;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index acd5122..4c38413 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){
@@ -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 )
@@ -529,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";
 					}