Merge pull request #74 from wanadev/bugfix-accelmanager-removal

Fixed AccelManager keystroke removal
wanadev · Sep 14, 2016 · 84257b2 · 84257b2
2 parents 3507009 + 6709a3e
commit 84257b2
Showing 1 changed file with 49 additions and 18 deletions.
diff --git a/src/nonvisual/accelmanager.js b/src/nonvisual/accelmanager.js
@@ -51,6 +51,7 @@ var AccelManager = Base.$extend({
 
     // Constructor
     __init__: function () {
+        this.__keys = {};
         this.__kbd = {};
         this.$super();
     },
@@ -61,6 +62,20 @@ var AccelManager = Base.$extend({
 
     // ====== Private properties ======
 
+    /**
+     * Registered keys.
+     *
+     *     {
+     *         "key": [ "id", "id", ... ]
+     *         ...
+     *     }
+     *
+     * @property __keys
+     * @private
+     * @type Object
+     */
+    __keys: null,
+
     /**
      * Keyboard bindings.
      *
@@ -74,6 +89,7 @@ var AccelManager = Base.$extend({
      *     }
      *
      * @property __kbd
+     * @private
      * @type Object
      */
     __kbd: null,
@@ -101,7 +117,12 @@ var AccelManager = Base.$extend({
             safe: ((safe === undefined) ? true : safe),
             callback: callback
         };
-        KeyboardJS.bind(keys, this.__onAccell.bind(this, id));
+
+        if (!this.__keys[keys]) {
+            KeyboardJS.bind(keys, this.__onAccel.bind(this, keys));
+            this.__keys[keys] = [];
+        }
+        this.__keys[keys].push(id);
     },
 
     /**
@@ -111,10 +132,17 @@ var AccelManager = Base.$extend({
      * @param {String} id the accelerator id.
      */
     removeAccel: function (id) {
-        if (!this.__kbd[id]) {
+        var bd = this.__kbd[id];
+        if (!bd) {
             return;
         }
-        KeyboardJS.unbind(this.__kbd[id].keys);
+
+        var keys = this.__keys[bd.keys];
+        keys.splice(keys.indexOf(id), 1);
+        if (keys.length === 0) {
+            KeyboardJS.unbind(this.__kbd[id].keys);
+            delete this.__keys[bd.keys];
+        }
         delete this.__kbd[id];
     },
 
@@ -130,28 +158,31 @@ var AccelManager = Base.$extend({
     //////////////////////////////////////////
 
     /**
-     * @method __onAccell
+     * @method __onAccel
      * @private
-     * @param event
-     * @param keys
-     * @param combo
+     * @param {String} keys
+     * @param {Event} event
      */
-    __onAccell: function (id, event) {
-        if (!this.__kbd[id]) {
+    __onAccel: function (keys, event) {
+        if (!this.__keys[keys]) {
             return;
         }
 
-        if (this.__kbd[id].safe) {
-            if (document.activeElement instanceof HTMLInputElement ||
-                document.activeElement instanceof HTMLSelectElement ||
-                document.activeElement instanceof HTMLTextAreaElement) {
-                return;
+        for (var i = 0; i < this.__keys[keys].length; ++i) {
+            var id = this.__keys[keys][i];
+
+            if (this.__kbd[id].safe) {
+                if (document.activeElement instanceof HTMLInputElement ||
+                    document.activeElement instanceof HTMLSelectElement ||
+                    document.activeElement instanceof HTMLTextAreaElement) {
+                    continue;
+                }
             }
-        }
 
-        this.__kbd[id].callback();
-        event.stopPropagation();
-        event.preventDefault();
+            this.__kbd[id].callback();
+            event.stopPropagation();
+            event.preventDefault();
+        }
     }
 
 });