diff options
| author | Matias Niemelä | 2013-09-06 16:09:18 -0400 |
|---|---|---|
| committer | Pete Bacon Darwin | 2013-09-06 22:19:53 +0100 |
| commit | d50ed6bfb8c4982401923ff535fe932ef4f387a2 (patch) | |
| tree | 994d16c178e0a5c0624b3839f44471141227be39 /src/ngAnimate | |
| parent | 28f56a383e9d1ff378e3568a3039e941c7ffb1d8 (diff) | |
| download | angular.js-d50ed6bfb8c4982401923ff535fe932ef4f387a2.tar.bz2 | |
fix(ngAnimate): check elapsedTime on current event
onAnimationProgress now checks the event's elapsedTime property before
checking the originalEvent.elapsedTime property.
Use browserTrigger with elapsedTime parameter to trigger animation events
Diffstat (limited to 'src/ngAnimate')
| -rw-r--r-- | src/ngAnimate/animate.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ngAnimate/animate.js b/src/ngAnimate/animate.js index d03ff643..34a105e1 100644 --- a/src/ngAnimate/animate.js +++ b/src/ngAnimate/animate.js @@ -659,7 +659,7 @@ angular.module('ngAnimate', ['ng']) } function onAnimationProgress(event) { - event.originalEvent.elapsedTime >= totalTime && done(); + (event.elapsedTime || (event.originalEvent && event.originalEvent.elapsedTime)) >= totalTime && done(); } function parseMaxTime(str) { |
