Merge pull request madrobby#96 from treshugart/madrobbyGH-95

Detect scope after filter has executed to allow for scope to change during filter execution.

keymaster.js

@@ -63,8 +63,8 @@
   };
 
   // handle keydown event
-  function dispatch(event, scope){
-    var key, handler, k, i, modifiersMatch;
+  function dispatch(event) {
+    var key, handler, k, i, modifiersMatch, scope;
     key = event.keyCode;
 
     if (index(_downKeys, key) == -1) {
@@ -88,6 +88,8 @@
     // abort if no potentially matching shortcuts found
     if (!(key in _handlers)) return;
 
+    scope = getScope();
+
     // for each potential shortcut
     for (i = 0; i < _handlers[key].length; i++) {
       handler = _handlers[key][i];
@@ -256,7 +258,7 @@
   };
 
   // set the handlers globally on document
-  addEvent(document, 'keydown', function(event) { dispatch(event, _scope) }); // Passing _scope to a callback to ensure it remains the same by execution. Fixes #48
+  addEvent(document, 'keydown', function(event) { dispatch(event) }); // Passing _scope to a callback to ensure it remains the same by execution. Fixes #48
   addEvent(document, 'keyup', clearModifier);
 
   // reset modifiers to false whenever the window is (re)focused.

test/keymaster.html

@@ -292,7 +292,7 @@ <h1>Keymaster unit tests</h1>
         var cntIssues = 0, cntFiles = 0;
         key('a', 'issues', function(){ cntIssues++ });
         key('a', 'files', function(){ cntFiles++ });
-        
+
         key.setScope('issues');
         keydown(65);
         keyup(65);
@@ -301,7 +301,7 @@ <h1>Keymaster unit tests</h1>
         keydown(65);
         keyup(65);
         t.assertEqual(1, cntIssues);
-        
+
         key.setScope('files');
         keydown(65);
         keyup(65);
@@ -372,6 +372,42 @@ <h1>Keymaster unit tests</h1>
         keydown(65); keyup(65);
         t.assertEqual(called, true);
         window.key = k;
+      },
+
+      testScopeChangeDuringFilter: function(t) {
+        var oldFilter = key.filter
+          , scope1Pressed = 0
+          , scope2Pressed = 0;
+
+        key('a', 'scope1', function() {
+          ++scope1Pressed;
+        });
+
+        key('a', 'scope2', function() {
+          ++scope2Pressed;
+        });
+
+        key.filter = function() {
+          key.setScope('scope1');
+          return true;
+        };
+
+        keydown(65);
+        keyup(65);
+        t.assertTrue(scope1Pressed === 1);
+
+        key.filter = function() {
+          key.setScope('scope2');
+          return true;
+        };
+
+        keydown(65);
+        keyup(65);
+        t.assertTrue(scope1Pressed === 1);
+        t.assertTrue(scope2Pressed === 1);
+
+        key.filter = oldFilter;
+        key.setScope();
       }
     });
   </script>