update to [email protected]

Author: afc163

keymaster/README.md

@@ -11,15 +11,19 @@ it in.*
 
 ## Usage
 
-Include `keymaster.min.js` in your web app, by loading it as usual:
+Include `keymaster.js` in your web app*, by loading it as usual:
 
 ```html
-<script src="keymaster.min.js"></script>
+<script src="keymaster.js"></script>
 ```
 
 Keymaster has no dependencies and can be used completely standalone.
 It should not interfere with any JavaScript libraries or frameworks.
 
+_*Preferably use a minified version that fits your workflow. You can
+run `make` to have UglifyJS (if you have it installed) create a
+`keymaster.min.js` file for you._
+
 ## Defining shortcuts
 
 One global method is exposed, `key` which defines shortcuts when
@@ -50,6 +54,7 @@ key('⌘+r, ctrl+r', function(event, handler){
 // "ctrl+r", "all"
 ```
 
+
 ## Supported keys
 
 Keymaster understands the following modifiers:
@@ -60,6 +65,7 @@ The following special keys can be used for shortcuts:
 `up`, `down`, `left`, `right`, `home`, `end`, `pageup`, `pagedown`, `del`, `delete`
 and `f1` through `f19`.
 
+
 ## Modifier key queries
 
 At any point in time (even in code other than key shortcut handlers),
@@ -71,6 +77,7 @@ allows easy implementation of things like shift+click handlers. For example,
 if(key.shift) alert('shift is pressed, OMGZ!');
 ```
 
+
 ## Other key queries
 
 At any point in time (even in code other than key shortcut handlers),
@@ -91,7 +98,7 @@ key.getPressedKeyCodes() // returns an array of key codes currently pressed
 
 ## Scopes
 
-If you want to reuse the same shortcut for seperate areas in your single page app,
+If you want to reuse the same shortcut for separate areas in your single page app,
 Keymaster supports switching between scopes. Use the `key.setScope` method to set scope.
 
 ```javascript
@@ -103,6 +110,7 @@ key('o, enter', 'files', function(){ /* do something else */ });
 key.setScope('issues'); // default scope is 'all'
 ```
 
+
 ## Filter key presses
 
 By default, when an `INPUT`, `SELECT` or `TEXTAREA` element is focused, Keymaster doesn't process any shortcuts.
@@ -136,6 +144,7 @@ key.filter = function(event){
 However a more robust way to handle this is to use proper
 focus and blur event handlers on your input element, and change scopes there as you see fit.
 
+
 ## noConflict mode
 
 You can call ```key.noConflict``` to remove the ```key``` function from global scope and restore whatever ```key``` was defined to before Keymaster was loaded. Calling ```key.noConflict``` will return the Keymaster ```key``` function.
@@ -148,6 +157,7 @@ key()
 // --> TypeError: 'undefined' is not a function
 ```
 
+
 ## Unbinding shortcuts
 
 Similar to defining shortcuts, they can be unbound using `key.unbind`.
@@ -162,13 +172,15 @@ key.unbind('o, enter', 'issues');
 key.unbind('o, enter', 'files');
 ```
 
+
 ## Notes
 
 Keymaster should work with any browser that fires `keyup` and `keydown` events,
 and is tested with IE (6+), Safari, Firefox and Chrome.
 
 See [http://madrobby.github.com/keymaster/](http://madrobby.github.com/keymaster/) for a live demo.
 
+
 ## CoffeeScript
 
 If you're using CoffeeScript, configuring key shortcuts couldn't be simpler:
@@ -186,19 +198,6 @@ key 'o, enter', 'issues', ->
 alert 'shift is pressed, OMGZ!' if key.shift
 ```
 
-## Ender support
-
-Add `keymaster` as a top level method to your [Ender](http://ender.no.de) compilation.
-
-    $ ender add keymaster
-
-Use it:
-
-``` js
-$.key('⌘+r', function () {
-  alert('reload!')
-})
-```
 
 ## Contributing
 
@@ -211,3 +210,4 @@ submit a pull request.
 
 Keymaster is (c) 2011-2013 Thomas Fuchs and may be freely distributed under the MIT license.
 See the `MIT-LICENSE` file.
+

keymaster/dist/keymaster-debug.js

@@ -1,7 +1,7 @@
 //     keymaster.js
-//     (c) 2011-2012 Thomas Fuchs
+//     (c) 2011-2013 Thomas Fuchs
 //     keymaster.js may be freely distributed under the MIT license.
-define("gallery/keymaster/1.0.2/keymaster-debug", [], function(require, exports, module) {
+define("gallery/keymaster/1.6.2/keymaster-debug", [], function(require, exports, module) {
     var global = {};
     var k, _handlers = {}, _mods = {
         16: false,
@@ -79,8 +79,8 @@ define("gallery/keymaster/1.0.2/keymaster-debug", [], function(require, exports,
         for (k in _mods) _mods[k] = event[modifierMap[k]];
     }
     // 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) {
             _downKeys.push(key);
@@ -100,6 +100,7 @@ define("gallery/keymaster/1.0.2/keymaster-debug", [], function(require, exports,
         if (!assignKey.filter.call(this, event)) return;
         // 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];
@@ -169,23 +170,27 @@ define("gallery/keymaster/1.0.2/keymaster-debug", [], function(require, exports,
     }
     // unbind all handlers for given key in current scope
     function unbindKey(key, scope) {
-        var keys = key.split("+"), mods = [], i, obj;
-        if (keys.length > 1) {
-            mods = getMods(keys);
-            key = keys[keys.length - 1];
-        }
-        key = code(key);
-        if (scope === undefined) {
-            scope = getScope();
-        }
-        if (!_handlers[key]) {
-            return;
-        }
-        for (i in _handlers[key]) {
-            obj = _handlers[key][i];
-            // only clear handlers if correct scope and mods match
-            if (obj.scope === scope && compareArray(obj.mods, mods)) {
-                _handlers[key][i] = {};
+        var multipleKeys, keys, mods = [], i, j, obj;
+        multipleKeys = getKeys(key);
+        for (j = 0; j < multipleKeys.length; j++) {
+            keys = multipleKeys[j].split("+");
+            if (keys.length > 1) {
+                mods = getMods(keys);
+                key = keys[keys.length - 1];
+            }
+            key = code(key);
+            if (scope === undefined) {
+                scope = getScope();
+            }
+            if (!_handlers[key]) {
+                return;
+            }
+            for (i = 0; i < _handlers[key].length; i++) {
+                obj = _handlers[key][i];
+                // only clear handlers if correct scope and mods match
+                if (obj.scope === scope && compareArray(obj.mods, mods)) {
+                    _handlers[key][i] = {};
+                }
             }
         }
     }
@@ -248,7 +253,7 @@ define("gallery/keymaster/1.0.2/keymaster-debug", [], function(require, exports,
     }
     // set the handlers globally on document
     addEvent(document, "keydown", function(event) {
-        dispatch(event, _scope);
+        dispatch(event);
     });
     // Passing _scope to a callback to ensure it remains the same by execution. Fixes #48
     addEvent(document, "keyup", clearModifier);

keymaster/dist/keymaster.js

@@ -1,7 +1,7 @@
 {
   "name": "keymaster",
   "family": "gallery",
-  "version": "1.0.2",
+  "version": "1.6.2",
   "package": "https://raw.github.com/madrobby/keymaster/master/package.json",
   "homepage": "https://github.com/madrobby/keymaster",
   "description": "library for defining and dispatching keyboard shortcuts",