X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Ffx.js;h=529fd4cde94d9beec9dbf1ac6cb5412fa07818ba;hb=59802928566b6be3a66d65e77c2418fff37e6f5f;hp=d3a7ad4046a1560f70528d27777442064959473a;hpb=3ec9f4990c13f7e44365c9216be5c81b2827385b;p=jquery.git

diff --git a/src/fx.js b/src/fx.js
index d3a7ad4..529fd4c 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -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;
 			}