X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ffx.js;h=529fd4cde94d9beec9dbf1ac6cb5412fa07818ba;hb=62a34450c0961e461a72ce4d96f94551ef393b56;hp=46000a58b8b7521c52a11ac876702717efee5a2f;hpb=ddb86f8d5bd1bd21b2beeeea55baf505b47dfed5;p=jquery.git

diff --git a/src/fx.js b/src/fx.js
index 46000a5..529fd4c 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -18,8 +18,8 @@ function genFx( type, num ){
 }
 
 jQuery.fn.extend({
-	show: function(speed,callback){
-		if ( speed ) {
+	show: function( speed, callback ) {
+		if ( speed != null ) {
 			return this.animate( genFx("show", 3), speed, callback);
 		} else {
 			for ( var i = 0, l = this.length; i < l; i++ ){
@@ -58,8 +58,8 @@ jQuery.fn.extend({
 		}
 	},
 
-	hide: function(speed,callback){
-		if ( speed ) {
+	hide: function( speed, callback ) {
+		if ( speed != null ) {
 			return this.animate( genFx("hide", 3), speed, callback);
 		} else {
 			for ( var i = 0, l = this.length; i < l; i++ ){
@@ -219,7 +219,7 @@ jQuery.each({
 jQuery.extend({
 
 	speed: function(speed, easing, fn) {
-		var opt = typeof speed === "object" ? speed : {
+		var opt = speed && typeof speed === "object" ? speed : {
 			complete: fn || !fn && easing ||
 				jQuery.isFunction( speed ) && speed,
 			duration: speed,
@@ -359,7 +359,9 @@ jQuery.fx.prototype = {
 					this.elem.style.overflow = this.options.overflow;
 
 					// Reset the display
-					this.elem.style.display = this.options.display;
+					var old = jQuery.data(this.elem, "olddisplay");
+					this.elem.style.display = old ? old : this.options.display;
+
 					if ( jQuery.css(this.elem, "display") == "none" ) {
 						this.elem.style.display = "block";
 					}
@@ -432,7 +434,7 @@ jQuery.extend( jQuery.fx, {
 
 		_default: function(fx){
 			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
-				fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
 			} else {
 				fx.elem[ fx.prop ] = fx.now;
 			}