mirror of
https://github.com/jquery/jquery.git
synced 2024-10-05 11:34:18 +00:00
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 commitfdd60f8705
Author: Corey Frang <gnarf@gnarf.net> Date: Mon Oct 10 13:51:59 2011 -0500 .stop( [queue,] clearQueue, gotoEnd )
This commit is contained in:
parent
83c08ffa1f
commit
6c4ca13d69
7
src/effects.js
vendored
7
src/effects.js
vendored
@ -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", [] );
|
||||
}
|
||||
|
6
test/unit/effects.js
vendored
6
test/unit/effects.js
vendored
@ -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();
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user