Skip to content
Permalink
Browse files

Makes sure each animation tick has the same timestamp for all animati…

…ons in the batch.
  • Loading branch information...
jaubourg committed Apr 7, 2011
1 parent b7dd840 commit 75a4bc4a4e55360c7c3c734cbef2558050ed4456
Showing with 14 additions and 3 deletions.
  1. +14 −3 src/effects.js
@@ -11,7 +11,17 @@ var elemdisplay = {},
[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
// opacity animations
[ "opacity" ]
];
],
fxNow;

function clearFxNow() {
fxNow = undefined;
}

function createFxNow() {
setTimeout( clearFxNow, 0 );
return ( fxNow = jQuery.now() );
}

jQuery.fn.extend({
show: function( speed, easing, callback ) {
@@ -349,7 +359,7 @@ jQuery.fx.prototype = {
var self = this,
fx = jQuery.fx;

this.startTime = jQuery.now();
this.startTime = fxNow || createFxNow();
this.start = from;
this.end = to;
this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
@@ -394,7 +404,8 @@ jQuery.fx.prototype = {

// Each step of an animation
step: function( gotoEnd ) {
var t = jQuery.now(), done = true;
var t = fxNow || createFxNow(),
done = true;

if ( gotoEnd || t >= this.options.duration + this.startTime ) {
this.now = this.end;

0 comments on commit 75a4bc4

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