Fix olddisplay was inappropriately set when calling hide on an already hidden element...

[jquery.git] / src / effects.js

diff --git a/src/effects.js b/src/effects.js
index 3257ac3..8662df5 100644 (file)
--- a/src/effects.js
+++ b/src/effects.js
@@ -13,40 +13,29 @@ var elemdisplay = {},
                [ "opacity" ]
        ];
 
-function defaultDisplay(nodeName) {
-       if ( !elemdisplay[ nodeName ] ) {
-               var elem = jQuery("<" + nodeName + ">").appendTo("body"),
-                       display = elem.css("display");
-
-               elem.remove();
-
-               if ( display === "none" || display === "" ) {
-                       display = "block";
-               }
-
-               elemdisplay[ nodeName ] = display;
-       }
-
-       return elemdisplay[ nodeName ];
-}
-
 jQuery.fn.extend({
        show: function( speed, easing, callback ) {
                if ( speed || speed === 0 ) {
                        return this.animate( genFx("show", 3), speed, easing, callback);
                } else {
                        for ( var i = 0, j = this.length; i < j; i++ ) {
+                               // Reset the inline display of this element to learn if it is
+                               // being hidden by cascaded rules or not
+                               if ( !jQuery.data(this[i], "olddisplay") && this[i].style.display === "none" ) {
+                                       this[i].style.display = "";
+                               }
+
                                // Set elements which have been overridden with display: none
                                // in a stylesheet to whatever the default browser style is
                                // for such an element
-                               if ( jQuery.css( this[i], "display" ) === "none" && this[i].style.display !== "none" ) {
+                               if ( this[i].style.display === "" && jQuery.css( this[i], "display" ) === "none" ) {
                                        jQuery.data(this[i], "olddisplay", defaultDisplay(this[i].nodeName));
                                }
                        }
 
-                       // Set the display of the elements in a second loop
+                       // Set the display of most of the elements in a second loop
                        // to avoid the constant reflow
-                       for ( i = 0, j = this.length; i < j; i++ ) {
+                       for ( i = 0; i < j; i++ ) {
                                this[i].style.display = jQuery.data(this[i], "olddisplay") || "";
                        }
 
@@ -59,17 +48,18 @@ jQuery.fn.extend({
                        return this.animate( genFx("hide", 3), speed, easing, callback);
 
                } else {
-                       for ( var i = 0, l = this.length; i < l; i++ ) {
-                               var old = jQuery.data(this[i], "olddisplay");
-                               if ( !old && old !== "none" ) {
-                                       jQuery.data( this[i], "olddisplay", jQuery.css( this[i], "display" ) );
+                       for ( var i = 0, j = this.length; i < j; i++ ) {
+                               var display = jQuery.css( this[i], "display" );
+
+                               if ( display !== "none" ) {
+                                       jQuery.data( this[i], "olddisplay", display );
                                }
                        }
 
                        // Set the display of the elements in a second loop
                        // to avoid the constant reflow
-                       for ( var j = 0, k = this.length; j < k; j++ ) {
-                               this[j].style.display = "none";
+                       for ( i = 0; i < j; i++ ) {
+                               this[i].style.display = "none";
                        }
 
                        return this;
@@ -115,7 +105,8 @@ jQuery.fn.extend({
                        // test suite
 
                        var opt = jQuery.extend({}, optall), p,
-                               hidden = this.nodeType === 1 && jQuery(this).is(":hidden"),
+                               isElement = this.nodeType === 1,
+                               hidden = isElement && jQuery(this).is(":hidden"),
                                self = this;
 
                        for ( p in prop ) {
@@ -131,17 +122,21 @@ jQuery.fn.extend({
                                        return opt.complete.call(this);
                                }
 
-                               if ( ( p === "height" || p === "width" ) ) {
+                               if ( isElement && ( p === "height" || p === "width" ) ) {
                                        // Make sure that nothing sneaks out
-                                       opt.overflow = this.style.overflow;
+                                       // Record all 3 overflow attributes because IE does not
+                                       // change the overflow attribute when overflowX and
+                                       // overflowY are set to the same value
+                                       opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
 
                                        // Set display property to inline-block for height/width
                                        // animations on inline elements that are having width/height
                                        // animated
-                                       if ( jQuery.curCSS( this, "display" ) === "inline" &&
-                                       jQuery.curCSS( this, "float" ) === "none" ) {
+                                       if ( jQuery.css( this, "display" ) === "inline" &&
+                                                       jQuery.css( this, "float" ) === "none" ) {
                                                if ( !jQuery.support.inlineBlockNeedsLayout ) {
                                                        this.style.display = "inline-block";
+
                                                } else {
                                                        var display = defaultDisplay(this.nodeName);
 
@@ -149,10 +144,9 @@ jQuery.fn.extend({
                                                        // block-level elements need to be inline with layout
                                                        if ( display === "inline" ) {
                                                                this.style.display = "inline-block";
-                                                       }
-                                                       else {
+
+                                                       } else {
                                                                this.style.display = "inline";
-                                                               jQuery.data( this, "oldzoom", this.style.zoom );
                                                                this.style.zoom = 1;
                                                        }
                                                }
@@ -399,8 +393,11 @@ jQuery.fx.prototype = {
 
                        if ( done ) {
                                // Reset the overflow
-                               if ( this.options.overflow != null ) {
-                                       this.elem.style.overflow = this.options.overflow;
+                               if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
+                                       var elem = this.elem, options = this.options;
+                                       jQuery.each( [ "", "X", "Y" ], function (index, value) {
+                                               elem.style[ "overflow" + value ] = options.overflow[index];
+                                       } );
                                }
 
                                // Hide the element if the "hide" operation was done
@@ -453,14 +450,14 @@ jQuery.extend( jQuery.fx, {
                        jQuery.fx.stop();
                }
        },
-  
+
        interval: 13,
-               
+
        stop: function() {
                clearInterval( timerId );
                timerId = null;
        },
-       
+
        speeds: {
                slow: 600,
                fast: 200,
@@ -491,4 +488,21 @@ if ( jQuery.expr && jQuery.expr.filters ) {
        };
 }
 
+function defaultDisplay( nodeName ) {
+       if ( !elemdisplay[ nodeName ] ) {
+               var elem = jQuery("<" + nodeName + ">").appendTo("body"),
+                       display = elem.css("display");
+
+               elem.remove();
+
+               if ( display === "none" || display === "" ) {
+                       display = "block";
+               }
+
+               elemdisplay[ nodeName ] = display;
+       }
+
+       return elemdisplay[ nodeName ];
+}
+
 })( jQuery );