Changeset 2129

Timestamp:

06/21/07 02:38:16 (1 year ago)

Author:

jeresig

Message:

Fix for #1214, #1216, #1234 (problem with animations). In a nutshell, the callback needs to occur even if the animation does not run.

Files:

• trunk/jquery/src/fx/fx.js (modified) (1 diff)

trunk/jquery/src/fx/fx.js

@@ -308 +308 @@
     animate: function( prop, speed, easing, callback ) {
         return this.queue(function(){
-            var hidden = jQuery(this).is(":hidden");
+            var hidden = jQuery(this).is(":hidden"),
+                opt = jQuery.speed(speed, easing, callback),
+                self = this;
             
             for ( var p in prop )
-                if ( prop[p] == "hide" && hidden ||
-                    prop[p] == "show" && !hidden )
-                        return;
+                if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
+                    return jQuery.isFunction(opt.complete) && opt.complete.apply(this);
         
             this.curAnim = jQuery.extend({}, prop);
-            var opt = jQuery.speed(speed, easing, callback);
-            var self = this;
             
             jQuery.each( prop, function(name, val){