From 031da1f96b3e0074e682e35ac909256c37c91864 Mon Sep 17 00:00:00 2001
From: Matias Niemelä
Date: Mon, 17 Jun 2013 22:40:01 -0400
Subject: fix($animator): ensure animations are always disabled for an element
 that is not attached to the DOM

---
 src/ng/animator.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

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