aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ngAnimate/animate.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ngAnimate/animate.js b/src/ngAnimate/animate.js
index 72c29cc3..a738987a 100644
--- a/src/ngAnimate/animate.js
+++ b/src/ngAnimate/animate.js
@@ -754,6 +754,8 @@ angular.module('ngAnimate', ['ng'])
}
function animationsDisabled(element, parentElement) {
+ if (rootAnimateState.disabled) return true;
+
if(element[0] == $rootElement[0]) {
return rootAnimateState.disabled || rootAnimateState.running;
}