wip: apply duration: 0 at all times

Author: Narretz

src/ngAnimate/animateCss.js

@@ -478,7 +478,7 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
       var startTime;
       var events = [];
 
-      if (options.duration === 0 || (!$sniffer.animations && !$sniffer.transitions)) {
+      if (!$sniffer.animations && !$sniffer.transitions) {
         return closeAndReturnNoopAnimator();
       }
 
@@ -572,7 +572,8 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
 
       var timings = computeTimings(node, fullClassName, cacheKey);
 
-      if (options.duration > 0) {
+      if (options.duration >= 0) {
+        dump('overwrite')
         // Duration in options overwrites duration set in style
         timings.transitionDuration = options.duration;
       }
@@ -595,14 +596,15 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
       var flags = {};
       flags.hasTransitions          = timings.transitionDuration > 0;
       flags.hasAnimations           = timings.animationDuration > 0;
-      flags.applyTransitionDuration = options.duration > 0 || hasToStyles && flags.hasTransitions;
+      flags.applyTransitionDuration = options.duration >= 0 || (hasToStyles && flags.hasTransitions);
       flags.applyAnimationDuration  = options.duration && flags.hasAnimations;
       flags.applyTransitionDelay    = truthyTimingValue(options.delay) && (flags.applyTransitionDuration || flags.hasTransitions);
       flags.applyAnimationDelay     = truthyTimingValue(options.delay) && flags.hasAnimations;
       flags.recalculateTimingStyles = addRemoveClassName.length > 0;
 
       if (flags.applyTransitionDuration || flags.applyAnimationDuration) {
-        maxDuration = options.duration ? parseFloat(options.duration) : maxDuration;
+        maxDuration = isDefined(options.duration) ? parseFloat(options.duration) : maxDuration;
+        dump('apply', timings.transitionDuration, maxDuration)
 
         if (flags.applyTransitionDuration) {
           flags.hasTransitions = true;
@@ -873,6 +875,8 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
           applyAnimationClasses(element, options);
           $$jqLite.addClass(element, activeClasses);
 
+          dump('T', timings, flags.recalculateTimingStyles)
+
           if (flags.recalculateTimingStyles) {
             fullClassName = node.className + ' ' + preparationClasses;
             cacheKey = gcsHashFn(node, fullClassName);

test/ngAnimate/animateCssSpec.js

@@ -2221,6 +2221,29 @@ describe("ngAnimate $animateCss", function() {
           expect(animator.$$willAnimate).toBeFalsy();
         }));
 
+        iit("should not prepare the animation at all if options.duration is 0 and transition styles are already on the element",
+          inject(function($animateCss, $rootElement, $window) {
+
+          ss.addRule('.animation', '-webkit-transition:1s linear all;' +
+                                          'transition:1s linear all;');
+          element.addClass('animation');
+
+          var options = {
+            duration: 0,
+            addClass: 'in'
+          };
+
+          var animator = $animateCss(element, options);
+
+          // expect(animator.$$willAnimate).toBeFalsy();
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+          dump(element.attr('style'))
+          dump($window.getComputedStyle(element[0]).transitionDuration)
+        }));
+
         it("should apply a transition and keyframe duration directly if both transitions and keyframe classes are detected",
           inject(function($animateCss, $rootElement) {