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

diff --git a/src/fx.js b/src/fx.js
index 15fce5c..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";
 					}