Merge pull request #129 from burtonjc/master

making unbind work with multiple keys
madrobby · Jul 2, 2014 · 564ea42 · 564ea42
2 parents 0f09fc1 + f198289
commit 564ea42
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/keymaster.js b/keymaster.js
@@ -176,9 +176,9 @@
 
       if (keys.length > 1) {
         mods = getMods(keys);
-        key = keys[keys.length - 1];
       }
 
+      key = keys[keys.length - 1];
       key = code(key);
 
       if (scope === undefined) {

diff --git a/test/keymaster.html b/test/keymaster.html
@@ -199,6 +199,23 @@ <h1>Keymaster unit tests</h1>
         t.assertEqual(1, cntCtrlShiftA);
       },
 
+      testUnbindWithKeysMultiple: function(t){
+        var cntSlashF = 0;
+        key('/, f', function(){ cntSlashF++ });
+
+        keydown(191); keyup(191);
+        keydown(70); keyup(70);
+
+        t.assertEqual(2, cntSlashF);
+
+        key.unbind('/, f');
+
+        keydown(191); keyup(191);
+        keydown(70); keyup(70);
+
+        t.assertEqual(2, cntSlashF);
+      },
+
       testFancyModifierKeys: function(t){
         var sequence = '';
         key('⌃+a', function(){ sequence += 'a' });