From 7075c903505fd1b0e0de3cc39dd4d894a8e8ed35 Mon Sep 17 00:00:00 2001 From: Andrew Kulinich Date: Fri, 23 May 2014 17:23:37 +0300 Subject: [PATCH] fix(ngAnimate): fix property name that is used to calculate cache key Fix property name that introduced a bug that occurs when there are 2 animations per page with similar signature. Due to mistype they were assigned same cache key so second animation was processed incorrectly --- src/ngAnimate/animate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngAnimate/animate.js b/src/ngAnimate/animate.js index e55977d53dbe..b4260342e836 100644 --- a/src/ngAnimate/animate.js +++ b/src/ngAnimate/animate.js @@ -1386,7 +1386,7 @@ angular.module('ngAnimate', ['ng']) }); element.addClass(activeClassName); - var eventCacheKey = elementData.eventCacheKey + ' ' + activeClassName; + var eventCacheKey = elementData.cacheKey + ' ' + activeClassName; var timings = getElementAnimationDetails(element, eventCacheKey); var maxDuration = Math.max(timings.transitionDuration, timings.animationDuration);