Use keyCapture service in contextMenu

alpheios-project · Jun 19, 2014 · 61f0cfa · 61f0cfa
1 parent 638b275
commit 61f0cfa
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/app/js/arethusa.context_menu/directives/context_menu.js b/app/js/arethusa.context_menu/directives/context_menu.js
@@ -5,7 +5,8 @@ angular.module('arethusa.contextMenu').factory('menuElement', function () {
   '$document',
   '$parse',
   'menuElement',
-  function ($document, $parse, menuElement) {
+  'keyCapture',
+  function ($document, $parse, menuElement, keyCapture) {
     return {
       restrict: 'A',
       scope: {
@@ -104,12 +105,13 @@ angular.module('arethusa.contextMenu').factory('menuElement', function () {
 
         $document.bind('click', handleOtherClick);
         $document.bind('contextmenu', handleOtherClick);
-        // Close when ESC is hit
-        $document.bind('keyup', function (event) {
-          if (opened && event.keyCode === 27) {
+
+        keyCapture.onKeyPressed(keyCapture.keyCodes.esc, function() {
+          if (opened) {
             closeAndApply();
+            keyCapture.stopPropagation();
           }
-        });
+        }, 1000);
       }
     };
   }