Permalink
Browse files

.stop( [queue,] clearQueue, gotoEnd )

  • Loading branch information...
1 parent c51a970 commit fdd60f8705e98430df62196f505cb929b2d7f6bc @gnarf gnarf committed Oct 10, 2011
Showing with 9 additions and 4 deletions.
  1. +6 −1 src/effects.js
  2. +3 −3 test/unit/effects.js
View
7 src/effects.js
@@ -248,7 +248,12 @@ jQuery.fn.extend({
this.queue( optall.queue, doAnimation );
},
- stop: function( clearQueue, gotoEnd, type ) {
+ stop: function( type, clearQueue, gotoEnd ) {
+ if ( typeof type !== "string" ) {
+ gotoEnd = clearQueue;
+ clearQueue = type;
+ type = undefined;
+ }
if ( clearQueue && type !== false ) {
this.queue( type || "fx", [] );
}
View
6 test/unit/effects.js
@@ -659,7 +659,7 @@ test("stop(clearQueue, gotoEnd)", function() {
}, 100);
});
-asyncTest( "stop( ..., ..., queue ) - Stop single queues", function() {
+asyncTest( "stop( queue, ..., ... ) - Stop single queues", function() {
expect( 3 );
var foo = jQuery( "#foo" ),
saved;
@@ -681,7 +681,7 @@ asyncTest( "stop( ..., ..., queue ) - Stop single queues", function() {
},{
duration: 1000,
queue: "height"
- }).dequeue( "height" ).stop( false, true, "height" );
+ }).dequeue( "height" ).stop( "height", false, true );
equals( foo.height(), 400, "Height was stopped with gotoEnd" );
@@ -690,7 +690,7 @@ asyncTest( "stop( ..., ..., queue ) - Stop single queues", function() {
},{
duration: 1000,
queue: "height"
- }).dequeue( "height" ).stop( false, false, "height" );
+ }).dequeue( "height" ).stop( "height", false, false );
saved = foo.height();
});

0 comments on commit fdd60f8

Please sign in to comment.