From d50ed6bfb8c4982401923ff535fe932ef4f387a2 Mon Sep 17 00:00:00 2001
From: Matias Niemelä
Date: Fri, 6 Sep 2013 16:09:18 -0400
Subject: 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
---
 src/ngAnimate/animate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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) {
-- 
cgit v1.2.3