Skip to content
Permalink
Browse files

Effects: First step() call should match :animated selector

Fixes #14623
Closes gh-1473
  • Loading branch information
dmethvin committed Dec 24, 2013
1 parent 5801c3a commit 085814474e4a854d533b5ccbaef24c090081e0c4
Showing with 19 additions and 1 deletion.
  1. +4 −1 src/effects.js
  2. +15 −0 test/unit/effects.js
@@ -610,8 +610,11 @@ jQuery.fx.tick = function() {
};

jQuery.fx.timer = function( timer ) {
if ( timer() && jQuery.timers.push( timer ) ) {
jQuery.timers.push( timer );
if ( timer() ) {
jQuery.fx.start();
} else {
jQuery.timers.pop();
}
};

@@ -1550,6 +1550,21 @@ test("Animation callback should not show animated element as :animated (#7157)",
this.clock.tick( 100 );
});

test("Initial step callback should show element as :animated (#14623)", 1, function() {
var foo = jQuery( "#foo" );

foo.animate({
opacity: 0,
}, {
duration: 100,
step: function() {
ok( foo.is(":animated"), "The element matches :animated inside step function" );
}
});
this.clock.tick( 1 );
foo.stop();
});

test( "hide called on element within hidden parent should set display to none (#10045)", 3, function() {
var hidden = jQuery(".hidden"),
elems = jQuery("<div>hide</div><div>hide0</div><div>hide1</div>");

0 comments on commit 0858144

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