aboutsummaryrefslogtreecommitdiffstats
path: root/src/Angular.js
diff options
context:
space:
mode:
authorIgor Minar2013-11-06 15:00:46 -0800
committerIgor Minar2013-11-08 01:03:17 -0800
commit98adc9e0383dc05efad168f30a0725cb67f5eda8 (patch)
tree6f51110899b8fb1b1e44bc8bcc47ff3fba2e7a46 /src/Angular.js
parent5cfacec499e77e464a81c7ebe4b6f240da1e8748 (diff)
downloadangular.js-98adc9e0383dc05efad168f30a0725cb67f5eda8.tar.bz2
fix($animate): don't force animations to be enabled
The way that enabling of animations was set up, made it impossible to inject a module into the bootstrap to disable animations for things like end 2 end tests. Now animations are temporarily blocked by setting the animation state to RUNNING during bootstrap, which allows the developer to permanently disable at any point by calling $animate.enabled(false).
Diffstat (limited to 'src/Angular.js')
-rw-r--r--src/Angular.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/Angular.js b/src/Angular.js
index 93fccd04..797e4b81 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -1207,7 +1207,6 @@ function bootstrap(element, modules) {
element.data('$injector', injector);
compile(element)(scope);
});
- animate.enabled(true);
}]
);
return injector;