Changeset 2242

Timestamp:

07/05/07 04:27:46 (1 year ago)

Author:

jeresig

Message:

Overflow revert was completely borked when you animated multiple properties (like in .show() or .hide()) (see bug #1343).

Files:

• trunk/jquery/src/fx/fx.js (modified) (3 diffs)

trunk/jquery/src/fx/fx.js

@@ -316 +316 @@
                 self = this;
             
-            for ( var p in prop )
+            for ( var p in prop ) {
                 if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
                     return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
+
+                if ( p == "height" || p == "width" ) {
+                    // Store display property
+                    opt.display = jQuery.css(this, "display");
+
+                    // Make sure that nothing sneaks out
+                    opt.overflow = this.style.overflow;
+                }
+            }
+
+            if ( opt.overflow != null )
+                this.style.overflow = "hidden";
 
             this.curAnim = jQuery.extend({}, prop);
@@ -423 +435 @@
         var y = elem.style;
         
-        if ( prop == "height" || prop == "width" ) {
-            // Store display property
-            var oldDisplay = jQuery.css(elem, "display");
-
-            // Make sure that nothing sneaks out
-            var oldOverflow = y.overflow;
-            y.overflow = "hidden";
-        }
-
         // Simple function for setting a style value
         z.a = function(){
@@ -530 +533 @@
 
                 if ( done ) {
-                    if ( oldDisplay != null ) {
+                    if ( options.display != null ) {
                         // Reset the overflow
-                        y.overflow = oldOverflow;
+                        y.overflow = options.overflow;
                     
                         // Reset the display
-                        y.display = oldDisplay;
+                        y.display = options.display;
                         if ( jQuery.css(elem, "display") == "none" )
                             y.display = "block";