Make sure that expando properties aren't set on embed, applet, or object elements...

[jquery.git] / src / fx.js

diff --git a/src/fx.js b/src/fx.js
index d8340b1..529fd4c 100644 (file)
--- a/src/fx.js
+++ b/src/fx.js
@@ -19,7 +19,7 @@ function genFx( type, num ){
 
 jQuery.fn.extend({
        show: function( speed, callback ) {
-               if ( typeof speed !== "undefined" ) {
+               if ( speed != null ) {
                        return this.animate( genFx("show", 3), speed, callback);
                } else {
                        for ( var i = 0, l = this.length; i < l; i++ ){
@@ -59,7 +59,7 @@ jQuery.fn.extend({
        },
 
        hide: function( speed, callback ) {
-               if ( typeof speed !== "undefined" ) {
+               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;
                        }