X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffx.js;h=6bcaac030db261f4cab5ef0db2922e27d2ca6aaa;hb=93fdbeb963a9c350f807818c7cc99982942a92f3;hp=15fce5c3a348800e05cd903a56fe1f5364928957;hpb=b24da33f52f8ce536ae60a6cbffeb2f5cf02bac5;p=jquery.git

diff --git a/src/fx.js b/src/fx.js
index 15fce5c..6bcaac0 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -128,6 +128,11 @@ jQuery.fn.extend({
 					// Make sure that nothing sneaks out
 					opt.overflow = this.style.overflow;
 				}
+				if ( jQuery.isArray( prop[p] ) ) {
+					// Create (if needed) and add to specialEasing
+					(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
+					prop[p] = prop[p][0];
+				}
 			}
 
 			if ( opt.overflow != null ) {
@@ -219,7 +224,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 +364,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";
 					}
@@ -385,7 +392,9 @@ jQuery.fx.prototype = {
 			this.state = n / this.options.duration;
 
 			// Perform the easing function, defaults to swing
-			this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration);
+			var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
+			var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
+			this.pos = jQuery.easing[specialEasing || defaultEasing](this.state, n, 0, 1, this.options.duration);
 			this.now = this.start + ((this.end - this.start) * this.pos);
 
 			// Perform the next step of the animation