Commit 781a5c0b authored by Corey Frang's avatar Corey Frang

Ensure each tick gets it's own fxNow - Fixes #12837 - Thanks @chadparry

Closes gh-1022
Closes gh-1021
parent 6b14cef7
...@@ -612,6 +612,8 @@ jQuery.fx.tick = function() { ...@@ -612,6 +612,8 @@ jQuery.fx.tick = function() {
timers = jQuery.timers, timers = jQuery.timers,
i = 0; i = 0;
fxNow = jQuery.now();
for ( ; i < timers.length; i++ ) { for ( ; i < timers.length; i++ ) {
timer = timers[ i ]; timer = timers[ i ];
// Checks the timer has not already been removed // Checks the timer has not already been removed
...@@ -623,6 +625,7 @@ jQuery.fx.tick = function() { ...@@ -623,6 +625,7 @@ jQuery.fx.tick = function() {
if ( !timers.length ) { if ( !timers.length ) {
jQuery.fx.stop(); jQuery.fx.stop();
} }
fxNow = undefined;
}; };
jQuery.fx.timer = function( timer ) { jQuery.fx.timer = function( timer ) {
......
...@@ -1818,6 +1818,35 @@ test( "Animate properly sets overflow hidden when animating width/height (#12117 ...@@ -1818,6 +1818,35 @@ test( "Animate properly sets overflow hidden when animating width/height (#12117
}); });
}); });
test( "Each tick of the timer loop uses a fresh time (#12837)", function() {
var lastVal, current,
tmp = jQuery({
test: 0
});
expect( 3 );
tmp.animate({
test: 100
}, {
step: function( p, fx ) {
ok( fx.now !== lastVal, "Current value is not the last value: " + lastVal + " - " + fx.now );
lastVal = fx.now;
}
});
current = jQuery.now();
// intentionally empty, we want to spin wheels until the time changes.
while ( current === jQuery.now() ) { }
// now that we have a new time, run another tick
jQuery.fx.tick();
current = jQuery.now();
// intentionally empty, we want to spin wheels until the time changes.
while ( current === jQuery.now() ) { }
jQuery.fx.tick();
tmp.stop();
});
test( "Animations with 0 duration don't ease (#12273)", 1, function() { test( "Animations with 0 duration don't ease (#12273)", 1, function() {
jQuery.easing.test = function() { jQuery.easing.test = function() {
ok( false, "Called easing" ); ok( false, "Called easing" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment