aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatias Niemelä2013-06-17 22:40:01 -0400
committerIgor Minar2013-07-15 09:30:54 -0700
commit031da1f96b3e0074e682e35ac909256c37c91864 (patch)
tree105a289325af599d5b9f8d12a6a2b4e5ba672056 /src
parent14626d0bc57cf55e8bde4a329b896308b6c09880 (diff)
downloadangular.js-031da1f96b3e0074e682e35ac909256c37c91864.tar.bz2
fix($animator): ensure animations are always disabled for an element that is not attached to the DOM
Diffstat (limited to 'src')
-rw-r--r--src/ng/animator.js3
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;