Fix for #1823 bug in animate {queue:false} plus a unit test.

diff --git a/src/fx.js b/src/fx.js
index a4f4ef875b0de8243b59bb39180a09485d212628..4ccb089111387147bae55f8bd40e859e52aa0196 100644 (file)
--- a/src/fx.js
+++ b/src/fx.js
@@ -201,7 +201,8 @@ jQuery.extend({
                // Queueing
                opt.old = opt.complete;
                opt.complete = function(){
-                       jQuery(this).dequeue();
+                       if ( opt.queue !== false )
+                               jQuery(this).dequeue();
                        if ( jQuery.isFunction( opt.old ) )
                                opt.old.apply( this );
                };

diff --git a/test/unit/fx.js b/test/unit/fx.js
index 1f9e674a163ea274a874d6d07539f549481809e5..6c5bb55cbebc6e2ff90c49a3435f4f23593e914a 100644 (file)
--- a/test/unit/fx.js
+++ b/test/unit/fx.js
@@ -11,6 +11,29 @@ test("animate(Hash, Object, Function)", function() {
        });
 });
 
+test("animate option (queue === false)", function () {
+  expect(1);
+  stop();
+  
+  var order = [];
+
+  var $foo = $("#foo");
+  $foo.animate({width:'100px'}, 200, function () {
+    // should finish after unqueued animation so second
+    order.push(2);
+  });
+  $foo.animate({fontSize:'2em'}, {queue:false, duration:10, complete:function () {
+    // short duration and out of queue so should finish first
+    order.push(1);
+  }});
+  $foo.animate({height:'100px'}, 10, function() {
+    // queued behind the first animation so should finish third 
+    order.push(3);
+    isSet( order, [ 1, 2, 3] );
+    start();
+  });
+});
+
 test("stop()", function() {
        expect(3);
        stop();