Skip to content
Permalink
Browse files

Squashed commit of the following:

commit af3fd32f207ed080084f10d76f89c07c414baa05
Merge: 83c08ff fdd60f8
Author: Dave Methvin <dave.methvin@gmail.com>
Date:   Tue Oct 11 21:17:56 2011 -0400

    Merge branch 'stop' of https://github.com/gnarf37/jquery into pull-541-stop

commit fdd60f8
Author: Corey Frang <gnarf@gnarf.net>
Date:   Mon Oct 10 13:51:59 2011 -0500

    .stop( [queue,] clearQueue, gotoEnd )
  • Loading branch information...
gnarf authored and dmethvin committed Oct 12, 2011
1 parent 83c08ff commit 6c4ca13d693663cdd124d4d29cb12897a6debc5e
Showing with 9 additions and 4 deletions.
  1. +6 −1 src/effects.js
  2. +3 −3 test/unit/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", [] );
}
@@ -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 6c4ca13

Please sign in to comment.
You can’t perform that action at this time.