aboutsummaryrefslogtreecommitdiffstats
path: root/src/ngAnimate
diff options
context:
space:
mode:
authorMatias Niemelä2013-09-06 16:09:18 -0400
committerPete Bacon Darwin2013-09-06 22:19:53 +0100
commitd50ed6bfb8c4982401923ff535fe932ef4f387a2 (patch)
tree994d16c178e0a5c0624b3839f44471141227be39 /src/ngAnimate
parent28f56a383e9d1ff378e3568a3039e941c7ffb1d8 (diff)
downloadangular.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.js2
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) {