fix(ngAnimate): allow animations on body and root elements

Closes #11956 Closes #12245
angular · Jul 17, 2015 · 44ce9c8 · 44ce9c8
1 parent 2ff1b09
commit 44ce9c8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/src/ngAnimate/animateQueue.js b/src/ngAnimate/animateQueue.js
@@ -523,8 +523,8 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
     }
 
     function areAnimationsAllowed(element, parentElement, event) {
-      var bodyElementDetected = false;
-      var rootElementDetected = false;
+      var bodyElementDetected = isMatchingElement(element, $$body) || element[0].nodeName === 'HTML';
+      var rootElementDetected = isMatchingElement(element, $rootElement);
       var parentAnimationDetected = false;
       var animateChildren;
 

diff --git a/test/ngAnimate/animateSpec.js b/test/ngAnimate/animateSpec.js
@@ -1227,6 +1227,34 @@ describe("animations", function() {
     });
   });
 
+  they('should allow an animation to run on the $prop element', ['$rootElement', 'body'], function(name) {
+    var capturedAnimation;
+
+    module(function($provide) {
+      $provide.factory('$rootElement', function($document) {
+        return jqLite($document[0].querySelector('html'));
+      });
+      $provide.factory('$$animation', function($$AnimateRunner) {
+        return function(element, method, options) {
+          capturedAnimation = arguments;
+          return new $$AnimateRunner();
+        };
+      });
+    });
+    inject(function($animate, $rootScope, $document, $rootElement) {
+      $animate.enabled(true);
+
+      var body = jqLite($document[0].body);
+      var targetElement = name === 'body' ? body : $rootElement;
+
+      $animate.addClass(targetElement, 'red');
+      $rootScope.$digest();
+
+      expect(capturedAnimation[0]).toBe(targetElement);
+      expect(capturedAnimation[1]).toBe('addClass');
+    });
+  });
+
   describe('[ng-animate-children]', function() {
     var parent, element, child, capturedAnimation, captureLog;
     beforeEach(module(function($provide) {