fix(dialog): keydown instead of keyup to close dialog

Previously md-dialog is watching for keyup while md-autocomplete is preventing keydown fixes #4041. closes #4884.
angular · Oct 6, 2015 · 23e18e1 · 23e18e1
1 parent 39efc85
commit 23e18e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/components/dialog/dialog.js b/src/components/dialog/dialog.js
@@ -632,16 +632,16 @@ function MdDialogProvider($$interimElementProvider) {
           }
         };
 
-        // Add keyup listeners
-        element.on('keyup', keyHandlerFn);
-        target.on('keyup', keyHandlerFn);
+        // Add keydown listeners
+        element.on('keydown', keyHandlerFn);
+        target.on('keydown', keyHandlerFn);
         window.on('resize', onWindowResize);
 
         // Queue remove listeners function
         removeListeners.push(function() {
 
-          element.off('keyup', keyHandlerFn);
-          target.off('keyup', keyHandlerFn);
+          element.off('keydown', keyHandlerFn);
+          target.off('keydown', keyHandlerFn);
           window.off('resize', onWindowResize);
 
         });

diff --git a/src/components/dialog/dialog.spec.js b/src/components/dialog/dialog.spec.js
@@ -346,7 +346,7 @@ describe('$mdDialog', function() {
       runAnimation();
 
       parent.triggerHandler({
-        type: 'keyup',
+        type: 'keydown',
         keyCode: $mdConstant.KEY_CODE.ESCAPE
       });
       runAnimation();
@@ -430,7 +430,7 @@ describe('$mdDialog', function() {
       runAnimation();
 
       parent.triggerHandler({
-        type: 'keyup',
+        type: 'keydown',
         keyCode: $mdConstant.KEY_CODE.ESCAPE
       });
       $timeout.flush();
@@ -526,7 +526,7 @@ describe('$mdDialog', function() {
       expect(parent.find('md-dialog').length).toBe(1);
 
       parent.triggerHandler({
-        type: 'keyup',
+        type: 'keydown',
         keyCode: $mdConstant.KEY_CODE.ESCAPE
       });
       $timeout.flush();
@@ -548,7 +548,7 @@ describe('$mdDialog', function() {
       runAnimation();
       expect(parent.find('md-dialog').length).toBe(1);
 
-      $rootElement.triggerHandler({type: 'keyup', keyCode: $mdConstant.KEY_CODE.ESCAPE});
+      $rootElement.triggerHandler({type: 'keydown', keyCode: $mdConstant.KEY_CODE.ESCAPE});
       runAnimation();
 
       expect(parent.find('md-dialog').length).toBe(1);