library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-10-05 11:34:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
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 fdd60f8705
Author: Corey Frang <gnarf@gnarf.net>
Date:   Mon Oct 10 13:51:59 2011 -0500

    .stop( [queue,] clearQueue, gotoEnd )
This commit is contained in:
Corey Frang 2011-10-11 21:21:59 -04:00 committed by Dave Methvin
parent 83c08ffa1f
commit 6c4ca13d69
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/effects.js vendored
View File

@ -248,7 +248,12 @@ jQuery.fn.extend({
this.queue( optall.queue, doAnimation ); 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 ) { if ( clearQueue && type !== false ) {
this.queue( type || "fx", [] ); this.queue( type || "fx", [] );
} }

6
test/unit/effects.js vendored
View File

@ -659,7 +659,7 @@ test("stop(clearQueue, gotoEnd)", function() {
}, 100); }, 100);
}); });
asyncTest( "stop( ..., ..., queue ) - Stop single queues", function() { asyncTest( "stop( queue, ..., ... ) - Stop single queues", function() {
expect( 3 ); expect( 3 );
var foo = jQuery( "#foo" ), var foo = jQuery( "#foo" ),
saved; saved;
@ -681,7 +681,7 @@ asyncTest( "stop( ..., ..., queue ) - Stop single queues", function() {
},{ },{
duration: 1000, duration: 1000,
queue: "height" queue: "height"
}).dequeue( "height" ).stop( false, true, "height" ); }).dequeue( "height" ).stop( "height", false, true );
equals( foo.height(), 400, "Height was stopped with gotoEnd" ); equals( foo.height(), 400, "Height was stopped with gotoEnd" );
@ -690,7 +690,7 @@ asyncTest( "stop( ..., ..., queue ) - Stop single queues", function() {
},{ },{
duration: 1000, duration: 1000,
queue: "height" queue: "height"
}).dequeue( "height" ).stop( false, false, "height" ); }).dequeue( "height" ).stop( "height", false, false );
saved = foo.height(); saved = foo.height();
}); });