]> source.dussan.org Git - jquery.git/commitdiff
Fixed the issue with queued effects becoming corrupted.
authorJohn Resig <jeresig@gmail.com>
Thu, 17 Aug 2006 02:38:34 +0000 (02:38 +0000)
committerJohn Resig <jeresig@gmail.com>
Thu, 17 Aug 2006 02:38:34 +0000 (02:38 +0000)
src/fx/fx.js

index 45cc2d917c8862395b670698267100185cceb47e..de65cfa29b1c8b0b0fa3f4469efe04d2ad3b8230 100644 (file)
@@ -475,11 +475,6 @@ jQuery.extend({
                                // Reset the overflow
                                y.overflow = z.el.oldOverflow;
 
-                               // If a callback was provided, execute it
-                               if( z.o.complete && z.o.complete.constructor == Function )
-                                       // Execute the complete function
-                                       z.o.complete.apply( z.el );
-
                                // Reset the property, if the item has been hidden
                                if ( z.o.hide )
                                        y[ prop ] = z.el.orig[ prop ].constructor == Number && prop != "opacity" ?
@@ -487,6 +482,11 @@ jQuery.extend({
 
                                // set its height and/or width to auto
                                jQuery.setAuto( z.el, prop );
+
+                               // If a callback was provided, execute it
+                               if( z.o.complete && z.o.complete.constructor == Function )
+                                       // Execute the complete function
+                                       z.o.complete.apply( z.el );
                        } else {
                                // Figure out where in the animation we are and set the number
                                var p = (t - this.startTime) / z.o.duration;