fix(dialog, menu, select): ignore transitionEnd event timeouts

due to conflicts with ngAnimate 1.4.x, temporarily ignore transitionEnd event timeouts. v0.11 will provide complete solution set to replace this interim solution.
kennethcachia · Sep 23, 2015 · 1b40c8b · 1b40c8b
1 parent 712805b
commit 1b40c8b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/core/util/animate.js b/src/core/util/animate.js
@@ -66,19 +66,13 @@ function AnimateDomUtils($mdUtil, $$rAF, $q, $timeout, $mdConstant) {
            */
           function finished(ev) {
             if ( ev && ev.target !== element[0]) return;
-            element.off($mdConstant.CSS.TRANSITIONEND, finished);
-
-            if ( ev  ) {
 
-              $timeout.cancel(timer);
-              resolve();
-
-            } else {
+            if ( ev  ) $timeout.cancel(timer);
+            element.off($mdConstant.CSS.TRANSITIONEND, finished);
 
-              // Only reject if timeout triggered
-              reject("waitTransitionEnd() timeout");
+            // Never reject since ngAnimate may cause timeouts due missed transitionEnd events
+            resolve();
 
-            }
           }
 
         });

diff --git a/src/core/util/animate.spec.js b/src/core/util/animate.spec.js
@@ -24,7 +24,7 @@ describe('animate', function() {
           });
         flush();
 
-        expect(expired).toBe(true);
+        expect(expired).not.toBe(true);
       }));
 
       it('using custom timeout duration',inject(function() {
@@ -38,7 +38,7 @@ describe('animate', function() {
           });
         flush();
 
-        expect(expired).toBe(true);
+        expect(expired).not.toBe(true);
       }));
 
     });