Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-03-24 02:10:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix($animate): don't force animations to be enabled

Browse source 
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).
This commit is contained in:
Igor Minar 2013-11-06 15:00:46 -08:00
parent 5cfacec499
commit 98adc9e038
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Angular.js
View file

@ -1207,7 +1207,6 @@ function bootstrap(element, modules) {
element.data('$injector', injector);
compile(element)(scope);
});
animate.enabled(true);
}]
);
return injector;

7
src/ngAnimate/animate.js
View file

@ -256,13 +256,18 @@ angular.module('ngAnimate', ['ng'])
var ELEMENT_NODE = 1;
var NG_ANIMATE_STATE = '$$ngAnimateState';
var NG_ANIMATE_CLASS_NAME = 'ng-animate';
var rootAnimateState = {disabled:true};
var rootAnimateState = {running: true};
$provide.decorator('$animate', ['$delegate', '$injector', '$sniffer', '$rootElement', '$timeout', '$rootScope', '$document',
function($delegate, $injector, $sniffer, $rootElement, $timeout, $rootScope, $document) {
$rootElement.data(NG_ANIMATE_STATE, rootAnimateState);
// disable animations during bootstrap, but once we bootstrapped, enable animations
$rootScope.$$postDigest(function() {
rootAnimateState.running = false;
});
function lookup(name) {
if (name) {
var matches = [],