diff options
| -rw-r--r-- | src/ngAnimate/animate.js | 5 | ||||
| -rw-r--r-- | test/ngAnimate/animateSpec.js | 23 |
2 files changed, 28 insertions, 0 deletions
diff --git a/src/ngAnimate/animate.js b/src/ngAnimate/animate.js index 64be7ba7..ad192a5b 100644 --- a/src/ngAnimate/animate.js +++ b/src/ngAnimate/animate.js @@ -898,6 +898,11 @@ angular.module('ngAnimate', ['ng']) // This triggers a reflow which allows for the transition animation to kick in. afterReflow(function() { + if(!element.hasClass(className)) { + done(); + return; + } + if(timings.transitionDuration > 0) { node.style[transitionProp + propertyKey] = ''; if(ii > 0 && stagger.transitionDelay > 0 && stagger.transitionDuration === 0) { diff --git a/test/ngAnimate/animateSpec.js b/test/ngAnimate/animateSpec.js index 207cfedb..ec37d8c3 100644 --- a/test/ngAnimate/animateSpec.js +++ b/test/ngAnimate/animateSpec.js @@ -1723,6 +1723,29 @@ describe("ngAnimate", function() { }); }); + it("should not perform the active class animation if the animation has been cancelled before the reflow occurs", function() { + inject(function($compile, $rootScope, $animate, $sniffer, $timeout) { + if(!$sniffer.transitions) return; + + ss.addRule('.animated.ng-enter', '-webkit-transition: 2s linear all;' + + 'transition: 2s linear all;'); + + var element = html($compile('<div>...</div>')($rootScope)); + var child = $compile('<div class="animated">...</div>')($rootScope); + + $animate.enter(child, element); + $rootScope.$digest(); + + expect(child.hasClass('ng-enter')).toBe(true); + + $animate.leave(child); + $rootScope.$digest(); + + $timeout.flush(); + expect(child.hasClass('ng-enter-active')).toBe(false); + }); + }); + // it("should add and remove CSS classes and perform CSS animations during the process", // inject(function($compile, $rootScope, $animate, $sniffer, $timeout) { // |