diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ng/animator.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ng/animator.js b/src/ng/animator.js index 5ad0535f..2a549f12 100644 --- a/src/ng/animator.js +++ b/src/ng/animator.js @@ -290,8 +290,9 @@ var $AnimatorProvider = function() { if (!parent) { parent = after ? after.parent() : element.parent(); } + var disabledAnimation = { running : true }; if ((!$sniffer.transitions && !polyfillSetup && !polyfillStart) || - (parent.inheritedData(NG_ANIMATE_CONTROLLER) || noop).running) { + (parent.inheritedData(NG_ANIMATE_CONTROLLER) || disabledAnimation).running) { beforeFn(element, parent, after); afterFn(element, parent, after); return; |
