fix($animateCss): consider options.delay value for closing timeout

Previously, options.delay was only considered when a class added an
extra transition style (which leads to style recalculation).

Fixes angular#13355

Author: Narretz

src/ngAnimate/animateCss.js

@@ -623,6 +623,7 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
 
       if (options.delay != null) {
         var delayStyle = parseFloat(options.delay);
+        maxDelay = Math.max(options.delay, 0);
 
         if (flags.applyTransitionDelay) {
           temporaryStyles.push(getCssDelayStyle(delayStyle));

test/ngAnimate/animateCssSpec.js

@@ -1986,6 +1986,31 @@ describe("ngAnimate $animateCss", function() {
           expect(prop).toEqual('500s');
         }));
 
+        it("should consider the delay for the closing timeout",
+          inject(function($animateCss, $rootElement, $timeout) {
+
+          element.css('height', '10px');
+
+          var options = {
+            delay: 3,
+            duration: 3,
+            to: {
+              height: '100px'
+            }
+          };
+
+          var animator = $animateCss(element, options);
+
+          animator.start();
+          triggerAnimationStartFrame();
+
+          expect(element.css(prefix + 'transition-delay')).toContain('3s');
+
+          $timeout.flush(5000);
+
+          expect(element.css(prefix + 'transition-delay')).toContain('3s');
+        }));
+
         it("should return false for the animator if a delay is provided but not a duration",
           inject(function($animateCss, $rootElement) {