X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx%2Ffx.js;h=7c2218e143487aa00f1695ed7a3e59390014841a;hb=7cc550727c4e0bcd93c5d435f0799f568fc74dfa;hp=6bbc772e3bdd4d32fa653b34ba258e66a1b1d899;hpb=05164f34be95f271301d5dbd9a1d13207b3bf850;p=jquery.git

diff --git a/src/fx/fx.js b/src/fx/fx.js
index 6bbc772..7c2218e 100644
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -305,14 +305,6 @@ jQuery.fn.extend({
 	 *   left: 50, opacity: 'show'
 	 * }, 500);
 	 *
-	 * @test stop();
-	 * var hash = {opacity: 'show'};
-	 * var hashCopy = $.extend({}, hash);
-	 * $('#foo').animate(hash, 'fast', function() {
-	 *  ok( hash.opacity == hashCopy.opacity, 'Check if animate changed the hash parameter' );
-	 *  start();
-	 * });
-	 *
 	 * @name animate
 	 * @type jQuery
 	 * @param Hash params A set of style attributes that you wish to animate, and to what end.
@@ -363,34 +355,6 @@ jQuery.fn.extend({
 });
 
 jQuery.extend({
-
-	setAuto: function(e,p) {
-		if ( e.notAuto ) return;
-
-		if ( p == "height" && e.scrollHeight != parseInt(jQuery.curCSS(e,p)) ) return;
-		if ( p == "width" && e.scrollWidth != parseInt(jQuery.curCSS(e,p)) ) return;
-
-		// Remember the original height
-		var a = e.style[p];
-
-		// Figure out the size of the height right now
-		var o = jQuery.curCSS(e,p,1);
-
-		if ( p == "height" && e.scrollHeight != o ||
-			p == "width" && e.scrollWidth != o ) return;
-
-		// Set the height to auto
-		e.style[p] = e.currentStyle ? "" : "auto";
-
-		// See what the size of "auto" is
-		var n = jQuery.curCSS(e,p,1);
-
-		// Revert back to the original size
-		if ( o != n && n != "auto" ) {
-			e.style[p] = a;
-			e.notAuto = true;
-		}
-	},
 	
 	speed: function(s,o) {
 		o = o || {};
@@ -435,66 +399,71 @@ jQuery.extend({
 	 */
 	
 	fx: function( elem, options, prop ){
-	
+
 		var z = this;
-	
+
 		// The users options
 		z.o = {
 			duration: options.duration || 400,
 			complete: options.complete,
 			step: options.step
 		};
-	
+
 		// The element
 		z.el = elem;
-	
+
 		// The styles
 		var y = z.el.style;
-	
+		
+		// Store display property
+		var oldDisplay = jQuery.css(z.el, 'display');
+		// Set display property to block for animation
+		y.display = "block";
+		// Make sure that nothing sneaks out
+		y.overflow = "hidden";
+
 		// Simple function for setting a style value
 		z.a = function(){
 			if ( options.step )
 				options.step.apply( elem, [ z.now ] );
- 
+
 			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";
 		};
-	
+
 		// Figure out the maximum number to run to
 		z.max = function(){
 			return parseFloat( jQuery.css(z.el,prop) );
 		};
-	
+
 		// Get the current size
 		z.cur = function(){
 			var r = parseFloat( jQuery.curCSS(z.el, prop) );
 			return r && r > -10000 ? r : z.max();
 		};
-	
+
 		// Start an animation from one number to another
 		z.custom = function(from,to){
 			z.startTime = (new Date()).getTime();
 			z.now = from;
 			z.a();
-	
+
 			z.timer = setInterval(function(){
 				z.step(from, to);
 			}, 13);
 		};
-	
+
 		// Simple 'show' function
 		z.show = function(){
 			if ( !z.el.orig ) z.el.orig = {};
 
 			// Remember where we started, so that we can go back to it later
 			z.el.orig[prop] = this.cur();
-			
-			var start = z.el.orig[prop];
-			
+
+			z.o.show = true;
+
 			// Begin the animation
 			z.custom(0, z.el.orig[prop]);
 
@@ -502,7 +471,7 @@ jQuery.extend({
 			if ( prop != "opacity" )
 				y[prop] = "1px";
 		};
-	
+
 		// Simple 'hide' function
 		z.hide = function(){
 			if ( !z.el.orig ) z.el.orig = {};
@@ -515,18 +484,11 @@ jQuery.extend({
 			// Begin the animation
 			z.custom(z.el.orig[prop], 0);
 		};
-	
-		// Remember  the overflow of the element
-		if ( !z.el.oldOverflow )
-			z.el.oldOverflow = jQuery.css( z.el, "overflow" );
-	
-		// Make sure that nothing sneaks out
-		y.overflow = "hidden";
-	
+
 		// Each step of an animation
 		z.step = function(firstNum, lastNum){
 			var t = (new Date()).getTime();
-	
+
 			if (t > z.o.duration + z.startTime) {
 				// Stop the timer
 				clearInterval(z.timer);
@@ -536,33 +498,32 @@ jQuery.extend({
 				z.a();
 
 				z.el.curAnim[ prop ] = true;
-				
+
 				var done = true;
 				for ( var i in z.el.curAnim )
 					if ( z.el.curAnim[i] !== true )
 						done = false;
-						
+
 				if ( done ) {
 					// Reset the overflow
-					y.overflow = z.el.oldOverflow;
-				
+					y.overflow = '';
+					
+					// Reset the display
+					y.display = oldDisplay;
+					if (jQuery.css(z.el, 'display') == 'none')
+						y.display = 'block';
+
 					// Hide the element if the "hide" operation was done
 					if ( z.o.hide ) 
 						y.display = 'none';
-					
-					// Reset the property, if the item has been hidden
-					if ( z.o.hide ) {
-						for ( var p in z.el.curAnim ) {
+
+					// Reset the properties, if the item has been hidden or shown
+					if ( z.o.hide || z.o.show )
+						for ( var p in z.el.curAnim )
 							if (p == "opacity")
 								jQuery.attr(y, p, z.el.orig[p]);
 							else
-								y[ p ] = z.el.orig[p] + "px";
-	
-							// set its height and/or width to auto
-							if ( p == 'height' || p == 'width' )
-								jQuery.setAuto( z.el, p );
-						}
-					}
+								y[p] = '';
 				}
 
 				// If a callback was provided, execute it
@@ -573,7 +534,7 @@ jQuery.extend({
 				// Figure out where in the animation we are and set the number
 				var p = (t - this.startTime) / z.o.duration;
 				z.now = ((-Math.cos(p*Math.PI)/2) + 0.5) * (lastNum-firstNum) + firstNum;
-	
+
 				// Perform the next step of the animation
 				z.a();
 			}