Skip to content
Permalink
Browse files

Fix #13937: Correctly scope .finish() following multi-element .animat…

…e(). Thanks @gnarf37. Close gh-1279.

(cherry picked from commit ae9e05e)
  • Loading branch information
gibson042 committed May 28, 2013
1 parent 68c9d05 commit 6fd5e480c1cd3e481e7097763ee281b65bc74306
Showing with 33 additions and 10 deletions.
  1. +3 −5 src/effects.js
  2. +0 −1 src/queue.js
  3. +30 −4 test/unit/effects.js
@@ -488,9 +488,7 @@ jQuery.fn.extend({
doAnimation = function() {
// Operate on a copy of prop so per-property easing won't be lost
var anim = Animation( this, jQuery.extend( {}, prop ), optall );
doAnimation.finish = function() {
anim.stop( true );
};

// Empty animations, or finishing resolves immediately
if ( empty || data_priv.get( this, "finish" ) ) {
anim.stop( true );
@@ -570,8 +568,8 @@ jQuery.fn.extend({
// empty the queue first
jQuery.queue( this, type, [] );

if ( hooks && hooks.cur && hooks.cur.finish ) {
hooks.cur.finish.call( this );
if ( hooks && hooks.stop ) {
hooks.stop.call( this, true );
}

// look for any active animations, and finish them
@@ -35,7 +35,6 @@ jQuery.extend({
startLength--;
}

hooks.cur = fn;
if ( fn ) {

// Add a progress sentinel to prevent the fx queue from being
@@ -2096,21 +2096,47 @@ test( ".finish( \"custom\" ) - custom queue animations", function() {
});

test( ".finish() calls finish of custom queue functions", function() {
function queueTester() {

function queueTester( next, hooks ) {
hooks.stop = function( gotoEnd ) {
inside++;
equal( this, div[0] );
ok( gotoEnd, "hooks.stop(true) called");
};
}
var div = jQuery( "<div>" );
var div = jQuery( "<div>" ),
inside = 0,
outside = 0;

expect( 3 );
expect( 6 );
queueTester.finish = function() {
outside++;
ok( true, "Finish called on custom queue function" );
};

div.queue( queueTester ).queue( queueTester ).queue( queueTester ).finish();

equal( inside, 1, "1 stop(true) callback" );
equal( outside, 2, "2 finish callbacks" );

div.remove();
});

asyncTest( ".finish() is applied correctly when multiple elements were animated (#13937)", function() {
expect( 3 );

var elems = jQuery("<a>0</a><a>1</a><a>2</a>");

elems.animate( { opacity: 0 }, 1500 ).animate( { opacity: 1 }, 1500 );
setTimeout(function() {
elems.eq( 1 ).finish();
ok( !elems.eq( 1 ).queue().length, "empty queue for .finish()ed element" );
ok( elems.eq( 0 ).queue().length, "non-empty queue for preceding element" );
ok( elems.eq( 2 ).queue().length, "non-empty queue for following element" );
elems.stop( true );
start();
}, 100 );
});

asyncTest( "slideDown() after stop() (#13483)", 2, function() {
var ul = jQuery( "<ul style='height: 100px;display: block'></ul>" ),
origHeight = ul.height();

0 comments on commit 6fd5e48

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