Skip to content
Permalink
Browse files

Fix #12447: Ensure starting-point calc takes finite time. Close gh-922.

  • Loading branch information...
gibson042 authored and dmethvin committed Sep 15, 2012
1 parent 560c178 commit e755c194161e1dc6793cbb690ba8334dad560c8f
Showing with 7 additions and 8 deletions.
  1. +7 −8 src/effects.js
@@ -5,12 +5,13 @@ var fxNow, timerId,
animationPrefilters = [ defaultPrefilter ],
tweeners = {
"*": [function( prop, value ) {
var end, unit, prevScale,
var end, unit,
tween = this.createTween( prop, value ),
parts = rfxnum.exec( value ),
target = tween.cur(),
start = +target || 0,
scale = 1;
scale = 1,
maxIterations = 20;

if ( parts ) {
end = +parts[2];
@@ -26,17 +27,15 @@ var fxNow, timerId,
do {
// If previous iteration zeroed out, double until we get *something*
// Use a string for doubling factor so we don't accidentally see scale as unchanged below
prevScale = scale = scale || ".5";
scale = scale || ".5";

// Adjust and apply
start = start / scale;
jQuery.style( tween.elem, prop, start + unit );

// Update scale, tolerating zeroes from tween.cur()
scale = tween.cur() / target;

// Stop looping if we've hit the mark or scale is unchanged
} while ( scale !== 1 && scale !== prevScale );
// Update scale, tolerating zero or NaN from tween.cur()
// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
}

tween.unit = unit;

0 comments on commit e755c19

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