mousetrap-rails 0.0.9 → 0.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 510a6cd6f40ef2ba974a305bdf77d11292a13d3c
+  data.tar.gz: 4e080a4551b296c562d79807d0fbe9a38ee43798
+SHA512:
+  metadata.gz: f7779a4ade4fb6ee4ad7871bb7bbd2eac1396fcb5282bf1225d5629f9b5a0d7513544ce1178c257f4d4662f4e760ea2b6dfffbdd9a352bb61fc48cc2fc8bce7c
+  data.tar.gz: 988ed39f05e62f268ad3f88f47a2f5f6909951956cc6017b9a68fd5b715a43b2effed1f78fabb8308b1471aa4b0d03e8ec4c168a258279ad1f62370d0b0a9f62

checksums.yaml.gz.sig

@@ -0,0 +1,3 @@
+��)
+�����i�y
+���I�Y���D�Ub�A�s���=����?R+V='\B��wakp;��򊖯#���K������pS���V�W���� �$��얡�1M?]qگ��J�F8�S�Zg�
F�d�أ��^ >H's\d5#Ova�i<oә�jl_��>��%U�0Z�e�軸���縿/��#��tu�.ۦrn����2y=�
�/�BF�/dB���J
��:YO�<lw�2�:h?w5��-�-[�

data/.gitignore

@@ -4,6 +4,8 @@
 .config
 .yardoc
 .rvmrc
+.ruby-gemset
+.ruby-version
 Gemfile.lock
 InstalledFiles
 _yardoc

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.0.10
+
+* update mousetrap.js to 1.4.1
+* use Tubolinks.visit for navigating if Turbolinks defined
+
 ## v0.0.9
 
 * sign gem with selfsigned certificate

data/LICENSE.md

@@ -1,6 +1,6 @@
 ### Gem mousetrap-rails
 
-Copyright (c) 2012 Nick Kugaevsky
+Copyright (c) 2012—2013 Nick Kugaevsky
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -1,8 +1,9 @@
-# Mousetrap::Rails [![endorse](http://api.coderwall.com/kugaevsky/endorsecount.png)](http://coderwall.com/kugaevsky) [![Build Status](https://secure.travis-ci.org/kugaevsky/mousetrap-rails.png?branch=master)](https://travis-ci.org/kugaevsky/mousetrap-rails) [![Dependency Status](https://gemnasium.com/kugaevsky/mousetrap-rails.png)](https://gemnasium.com/kugaevsky/mousetrap-rails) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/kugaevsky/mousetrap-rails)
+# Mousetrap::Rails
+[![Flattr this](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/1233054/Mousetrap-rails-gem) [![endorse](http://api.coderwall.com/kugaevsky/endorsecount.png)](http://coderwall.com/kugaevsky) [![Dependency Status](https://gemnasium.com/kugaevsky/mousetrap-rails.png)](https://gemnasium.com/kugaevsky/mousetrap-rails) [![Code Climate](https://codeclimate.com/github/kugaevsky/mousetrap-rails.png)](https://codeclimate.com/github/kugaevsky/mousetrap-rails) [![Build Status](https://travis-ci.org/kugaevsky/mousetrap-rails.png?branch=master)](https://travis-ci.org/kugaevsky/mousetrap-rails) [![Coverage Status](https://coveralls.io/repos/kugaevsky/mousetrap-rails/badge.png?branch=master)](https://coveralls.io/r/kugaevsky/mousetrap-rails)
 
 [Mousetrap](https://github.com/ccampbell/mousetrap) is a javascript library for handling keyboard shortcuts in your web applications written by [Craig Campbell](http://craig.is/).
 
-The `mousetrap-rails` gem integrates Mousetrap javascript library with Rails Asset Pipeline.
+The `mousetrap-rails` gem integrates Mousetrap javascript library with Rails asset pipeline.
 
 
 ## Installation
@@ -27,7 +28,7 @@ $ bundle install
 $ rails generate mousetrap:install
 ```
 
-It will create sample `keybindings.js.coffee` file in `app/assets/javascripts` and insert mousetrap-rails files to manifests of assert pipeline
+It will create a sample `keybindings.js.coffee` file in `app/assets/javascripts` and insert mousetrap-rails files to manifests of asset pipeline
 
 ```coffeescript
 //= require mousetrap     # ---> application.js
@@ -55,7 +56,7 @@ You can add keyboard navigation to your links by using `data-keybinding` attribu
 = link_to 'About', about_path, data: { keybinding: '["a", "c"]' }   # Press 'a' or 'c' to navigate to about
 ```
 
-You can jump to input
+You can jump to an input
 
 ```haml
 = text_field_tag 'Username', nil, data: { keybinding: 'u' }     # Press 'u' to focus username input field
@@ -99,6 +100,16 @@ You can find full documentation on [Mousetrap library page](http://craig.is/kill
 
 You can display key binding hints near links with `data-keybinding` attribute by pressing `Alt+Shift+h`. Now it's just experimental feature for debugging purposes only.
 
+## TODO
+
+- [ ] Add moustrap extensions generator
+
+## Contributing
+
+Please submit all pull requests against latest `*.wip` branch. If your pull request contains new features, you **must** include relevant tests.
+
+Thanks in advance!
+
 
 ## Changelog
 

data/lib/generators/mousetrap/install/templates/keybindings.js.coffee

@@ -2,7 +2,13 @@ $ ->
   # Hotkey binding to links with 'data-keybinding' attribute
   # Navigate link when hotkey pressed
   $('a[data-keybinding]').each (i, el) ->
-    Mousetrap.bind $(el).data('keybinding'), (e) -> el.click()
+    Mousetrap.bind $(el).data('keybinding'), (e) ->
+      if typeof(Turbolinks) == 'undefined'
+        # Emulate click if turbolinks defined
+        el.click()
+      else
+        # Use turbolinks to go to URL
+        Turbolinks.visit(el.href)
 
   # Hotkey binding to inputs with 'data-keybinding' attribute
   # Focus input when hotkey pressed
@@ -17,7 +23,7 @@ $ ->
   # Toggle show/hide hotkey hints
   window.mouseTrapRails =
     showOnLoad: false           # Show/hide hotkey hints by default (on page load). Mostly for debugging purposes.
-    toggleKeys: 'alt+shift+h'   # Key sequence to toggle hints visibility.
+    toggleKeys: 'alt+shift+h'   # Keys combo to toggle hints visibility.
     keysShown: false
     toggleHints:  ->
       $('a[data-keybinding]').each (i, el) ->

data/lib/mousetrap-rails/version.rb

@@ -1,5 +1,5 @@
 module Mousetrap
   module Rails
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

data/mousetrap-rails.gemspec

@@ -6,8 +6,8 @@ require 'mousetrap-rails/version'
 Gem::Specification.new do |gem|
   gem.name          = "mousetrap-rails"
   gem.version       = Mousetrap::Rails::VERSION
-  gem.authors       = ["Nick Kugaevsky"]
-  gem.email         = ["nick@kugaevsky.ru"]
+  gem.authors       = "Nick Kugaevsky"
+  gem.email         = "nick@kugaevsky.ru"
   gem.description   = %q{Mousetrap is a javascript library for handling keyboard shortcuts in your web applications. This gem integrates Mousetrap with Rails asset pipeline for easy of use.}
   gem.summary       = %q{Integrate Mousetrap javascript library with Rails Asset Pipeline}
   gem.homepage      = "http://kugaevsky.github.com/mousetrap-rails"
@@ -20,11 +20,12 @@ Gem::Specification.new do |gem|
   gem.signing_key = '/Users/nick/.ssh/gem-private_key.pem'
   gem.cert_chain  = ['gem-public_cert.pem']
 
-  gem.add_development_dependency 'rails', '~> 3.2.11'
+  gem.add_development_dependency 'rails', '~> 3.2.12'
   gem.add_development_dependency 'sqlite3', '~> 1.3.5'
-  gem.add_development_dependency 'rspec-rails', '~> 2.12.0'
+  gem.add_development_dependency 'rspec-rails', '~> 2.13.0'
   gem.add_development_dependency 'genspec', '~> 0.2.7'
   gem.add_development_dependency 'sass', '~> 3.2.1'
+  gem.add_development_dependency 'coveralls'
 
   gem.licenses      = ['MIT', 'Apache']
   gem.post_install_message =  <<MSG

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
 require 'genspec'
+require 'coveralls'
+Coveralls.wear!
 
 # Require gem generators
 Dir[Rails.root.join("../../lib/generators/mousetrap/**/*_generator.rb")].each {|f| require f}

data/vendor/assets/javascripts/mousetrap.js

@@ -1,5 +1,6 @@
+/*global define:false */
 /**
- * Copyright 2012 Craig Campbell
+ * Copyright 2013 Craig Campbell
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
  * Mousetrap is a simple keyboard shortcut library for Javascript with
  * no external dependencies
  *
- * @version 1.3.0
+ * @version 1.4.1
  * @url craig.is/killing/mice
  */
 (function() {
@@ -124,7 +125,8 @@
             'option': 'alt',
             'command': 'meta',
             'return': 'enter',
-            'escape': 'esc'
+            'escape': 'esc',
+            'mod': /Mac|iPod|iPhone|iPad/.test(navigator.platform) ? 'meta' : 'ctrl'
         },
 
         /**
@@ -178,7 +180,7 @@
          *
          * @type {boolean|string}
          */
-        _sequenceType = false;
+        _nextExpectedAction = false;
 
     /**
      * loop through the f keys, f1 to f19 and add them to the map
@@ -222,7 +224,22 @@
 
         // for keypress events we should return the character as is
         if (e.type == 'keypress') {
-            return String.fromCharCode(e.which);
+            var character = String.fromCharCode(e.which);
+
+            // if the shift key is not pressed then it is safe to assume
+            // that we want the character to be lowercase.  this means if
+            // you accidentally have caps lock on then your key bindings
+            // will continue to work
+            //
+            // the only side effect that might not be desired is if you
+            // bind something like 'A' cause you want to trigger an
+            // event when capital A is pressed caps lock will no longer
+            // trigger the event.  shift+a will though.
+            if (!e.shiftKey) {
+                character = character.toLowerCase();
+            }
+
+            return character;
         }
 
         // for non keypress events the special maps are needed
@@ -235,6 +252,10 @@
         }
 
         // if it is not in the special map
+
+        // with keydown and keyup events the character seems to always
+        // come in as an uppercase character whether you are pressing shift
+        // or not.  we should make sure it is always lowercase for comparisons
         return String.fromCharCode(e.which).toLowerCase();
     }
 
@@ -255,14 +276,14 @@
      * @param {Object} doNotReset
      * @returns void
      */
-    function _resetSequences(doNotReset, maxLevel) {
+    function _resetSequences(doNotReset) {
         doNotReset = doNotReset || {};
 
         var activeSequences = false,
             key;
 
         for (key in _sequenceLevels) {
-            if (doNotReset[key] && _sequenceLevels[key] > maxLevel) {
+            if (doNotReset[key]) {
                 activeSequences = true;
                 continue;
             }
@@ -270,7 +291,7 @@
         }
 
         if (!activeSequences) {
-            _sequenceType = false;
+            _nextExpectedAction = false;
         }
     }
 
@@ -281,11 +302,12 @@
      * @param {string} character
      * @param {Array} modifiers
      * @param {Event|Object} e
-     * @param {boolean=} remove - should we remove any matches
+     * @param {string=} sequenceName - name of the sequence we are looking for
      * @param {string=} combination
+     * @param {number=} level
      * @returns {Array}
      */
-    function _getMatches(character, modifiers, e, remove, combination) {
+    function _getMatches(character, modifiers, e, sequenceName, combination, level) {
         var i,
             callback,
             matches = [],
@@ -306,9 +328,9 @@
         for (i = 0; i < _callbacks[character].length; ++i) {
             callback = _callbacks[character][i];
 
-            // if this is a sequence but it is not at the right level
-            // then move onto the next match
-            if (callback.seq && _sequenceLevels[callback.seq] != callback.level) {
+            // if a sequence name is not specified, but this is a sequence at
+            // the wrong level then move onto the next match
+            if (!sequenceName && callback.seq && _sequenceLevels[callback.seq] != callback.level) {
                 continue;
             }
 
@@ -327,9 +349,14 @@
             // firefox will fire a keypress if meta or control is down
             if ((action == 'keypress' && !e.metaKey && !e.ctrlKey) || _modifiersMatch(modifiers, callback.modifiers)) {
 
-                // remove is used so if you change your mind and call bind a
-                // second time with a new function the first one is overwritten
-                if (remove && callback.combo == combination) {
+                // when you bind a combination or sequence a second time it
+                // should overwrite the first one.  if a sequenceName or
+                // combination is specified in this call it does just that
+                //
+                // @todo make deleting its own method?
+                var deleteCombo = !sequenceName && callback.combo == combination;
+                var deleteSequence = sequenceName && callback.seq == sequenceName && callback.level == level;
+                if (deleteCombo || deleteSequence) {
                     _callbacks[character].splice(i, 1);
                 }
 
@@ -403,16 +430,24 @@
      * handles a character key event
      *
      * @param {string} character
+     * @param {Array} modifiers
      * @param {Event} e
      * @returns void
      */
-    function _handleCharacter(character, e) {
-        var callbacks = _getMatches(character, _eventModifiers(e), e),
+    function _handleKey(character, modifiers, e) {
+        var callbacks = _getMatches(character, modifiers, e),
             i,
             doNotReset = {},
             maxLevel = 0,
             processedSequenceCallback = false;
 
+        // Calculate the maxLevel for sequences so we can only execute the longest callback sequence
+        for (i = 0; i < callbacks.length; ++i) {
+            if (callbacks[i].seq) {
+                maxLevel = Math.max(maxLevel, callbacks[i].level);
+            }
+        }
+
         // loop through matching callbacks for this key event
         for (i = 0; i < callbacks.length; ++i) {
 
@@ -422,11 +457,20 @@
             // callback for matching g cause otherwise you can only ever
             // match the first one
             if (callbacks[i].seq) {
-                processedSequenceCallback = true;
 
-                // as we loop through keep track of the max
-                // any sequence at a lower level will be discarded
-                maxLevel = Math.max(maxLevel, callbacks[i].level);
+                // only fire callbacks for the maxLevel to prevent
+                // subsequences from also firing
+                //
+                // for example 'a option b' should not cause 'option b' to fire
+                // even though 'option b' is part of the other sequence
+                //
+                // any sequences that do not match here will be discarded
+                // below by the _resetSequences call
+                if (callbacks[i].level != maxLevel) {
+                    continue;
+                }
+
+                processedSequenceCallback = true;
 
                 // keep a list of which sequences were matches for later
                 doNotReset[callbacks[i].seq] = 1;
@@ -436,16 +480,24 @@
 
             // if there were no sequence matches but we are still here
             // that means this is a regular match so we should fire that
-            if (!processedSequenceCallback && !_sequenceType) {
+            if (!processedSequenceCallback) {
                 _fireCallback(callbacks[i].callback, e, callbacks[i].combo);
             }
         }
 
-        // if you are inside of a sequence and the key you are pressing
-        // is not a modifier key then we should reset all sequences
-        // that were not matched by this key event
-        if (e.type == _sequenceType && !_isModifier(character)) {
-            _resetSequences(doNotReset, maxLevel);
+        // if the key you pressed matches the type of sequence without
+        // being a modifier (ie "keyup" or "keypress") then we should
+        // reset all sequences that were not matched by this event
+        //
+        // this is so, for example, if you have the sequence "h a t" and you
+        // type "h e a r t" it does not match.  in this case the "e" will
+        // cause the sequence to reset
+        //
+        // modifier keys are ignored because you can have a sequence
+        // that contains modifiers such as "enter ctrl+space" and in most
+        // cases the modifier key will be pressed before the next key
+        if (e.type == _nextExpectedAction && !_isModifier(character)) {
+            _resetSequences(doNotReset);
         }
     }
 
@@ -455,7 +507,7 @@
      * @param {Event} e
      * @returns void
      */
-    function _handleKey(e) {
+    function _handleKeyEvent(e) {
 
         // normalize e.which for key events
         // @see http://stackoverflow.com/questions/4285627/javascript-keycode-vs-charcode-utter-confusion
@@ -475,7 +527,7 @@
             return;
         }
 
-        _handleCharacter(character, e);
+        Mousetrap.handleKey(character, _eventModifiers(e), e);
     }
 
     /**
@@ -565,90 +617,89 @@
         // and setting the level to 0
         _sequenceLevels[combo] = 0;
 
-        // if there is no action pick the best one for the first key
-        // in the sequence
-        if (!action) {
-            action = _pickBestAction(keys[0], []);
-        }
-
         /**
          * callback to increase the sequence level for this sequence and reset
          * all other sequences that were active
          *
-         * @param {Event} e
-         * @returns void
+         * @param {string} nextAction
+         * @returns {Function}
          */
-        var _increaseSequence = function(e) {
-                _sequenceType = action;
+        function _increaseSequence(nextAction) {
+            return function() {
+                _nextExpectedAction = nextAction;
                 ++_sequenceLevels[combo];
                 _resetSequenceTimer();
-            },
-
-            /**
-             * wraps the specified callback inside of another function in order
-             * to reset all sequence counters as soon as this sequence is done
-             *
-             * @param {Event} e
-             * @returns void
-             */
-            _callbackAndReset = function(e) {
-                _fireCallback(callback, e, combo);
-
-                // we should ignore the next key up if the action is key down
-                // or keypress.  this is so if you finish a sequence and
-                // release the key the final key will not trigger a keyup
-                if (action !== 'keyup') {
-                    _ignoreNextKeyup = _characterFromEvent(e);
-                }
+            };
+        }
 
-                // weird race condition if a sequence ends with the key
-                // another sequence begins with
-                setTimeout(_resetSequences, 10);
-            },
-            i;
+        /**
+         * wraps the specified callback inside of another function in order
+         * to reset all sequence counters as soon as this sequence is done
+         *
+         * @param {Event} e
+         * @returns void
+         */
+        function _callbackAndReset(e) {
+            _fireCallback(callback, e, combo);
+
+            // we should ignore the next key up if the action is key down
+            // or keypress.  this is so if you finish a sequence and
+            // release the key the final key will not trigger a keyup
+            if (action !== 'keyup') {
+                _ignoreNextKeyup = _characterFromEvent(e);
+            }
+
+            // weird race condition if a sequence ends with the key
+            // another sequence begins with
+            setTimeout(_resetSequences, 10);
+        }
 
         // loop through keys one at a time and bind the appropriate callback
         // function.  for any key leading up to the final one it should
         // increase the sequence. after the final, it should reset all sequences
-        for (i = 0; i < keys.length; ++i) {
-            _bindSingle(keys[i], i < keys.length - 1 ? _increaseSequence : _callbackAndReset, action, combo, i);
+        //
+        // if an action is specified in the original bind call then that will
+        // be used throughout.  otherwise we will pass the action that the
+        // next key in the sequence should match.  this allows a sequence
+        // to mix and match keypress and keydown events depending on which
+        // ones are better suited to the key provided
+        for (var i = 0; i < keys.length; ++i) {
+            var isFinal = i + 1 === keys.length;
+            var wrappedCallback = isFinal ? _callbackAndReset : _increaseSequence(action || _getKeyInfo(keys[i + 1]).action);
+            _bindSingle(keys[i], wrappedCallback, action, combo, i);
         }
     }
 
     /**
-     * binds a single keyboard combination
+     * Converts from a string key combination to an array
      *
-     * @param {string} combination
-     * @param {Function} callback
-     * @param {string=} action
-     * @param {string=} sequenceName - name of sequence if part of sequence
-     * @param {number=} level - what part of the sequence the command is
-     * @returns void
+     * @param  {string} combination like "command+shift+l"
+     * @return {Array}
      */
-    function _bindSingle(combination, callback, action, sequenceName, level) {
-
-        // store a direct mapped reference for use with Mousetrap.trigger
-        _directMap[combination + ':' + action] = callback;
+    function _keysFromString(combination) {
+        if (combination === '+') {
+            return ['+'];
+        }
 
-        // make sure multiple spaces in a row become a single space
-        combination = combination.replace(/\s+/g, ' ');
+        return combination.split('+');
+    }
 
-        var sequence = combination.split(' '),
-            i,
+    /**
+     * Gets info for a specific key combination
+     *
+     * @param  {string} combination key combination ("command+s" or "a" or "*")
+     * @param  {string=} action
+     * @returns {Object}
+     */
+    function _getKeyInfo(combination, action) {
+        var keys,
             key,
-            keys,
+            i,
             modifiers = [];
 
-        // if this pattern is a sequence of keys then run through this method
-        // to reprocess each pattern one key at a time
-        if (sequence.length > 1) {
-            _bindSequence(combination, sequence, callback, action);
-            return;
-        }
-
         // take the keys from this pattern and figure out what the actual
         // pattern is all about
-        keys = combination === '+' ? ['+'] : combination.split('+');
+        keys = _keysFromString(combination);
 
         for (i = 0; i < keys.length; ++i) {
             key = keys[i];
@@ -676,14 +727,49 @@
         // we will try to pick the best event for it
         action = _pickBestAction(key, modifiers, action);
 
+        return {
+            key: key,
+            modifiers: modifiers,
+            action: action
+        };
+    }
+
+    /**
+     * binds a single keyboard combination
+     *
+     * @param {string} combination
+     * @param {Function} callback
+     * @param {string=} action
+     * @param {string=} sequenceName - name of sequence if part of sequence
+     * @param {number=} level - what part of the sequence the command is
+     * @returns void
+     */
+    function _bindSingle(combination, callback, action, sequenceName, level) {
+
+        // store a direct mapped reference for use with Mousetrap.trigger
+        _directMap[combination + ':' + action] = callback;
+
+        // make sure multiple spaces in a row become a single space
+        combination = combination.replace(/\s+/g, ' ');
+
+        var sequence = combination.split(' '),
+            info;
+
+        // if this pattern is a sequence of keys then run through this method
+        // to reprocess each pattern one key at a time
+        if (sequence.length > 1) {
+            _bindSequence(combination, sequence, callback, action);
+            return;
+        }
+
+        info = _getKeyInfo(combination, action);
+
         // make sure to initialize array if this is the first time
         // a callback is added for this key
-        if (!_callbacks[key]) {
-            _callbacks[key] = [];
-        }
+        _callbacks[info.key] = _callbacks[info.key] || [];
 
         // remove an existing match if there is one
-        _getMatches(key, modifiers, {type: action}, !sequenceName, combination);
+        _getMatches(info.key, info.modifiers, {type: info.action}, sequenceName, combination, level);
 
         // add this call back to the array
         // if it is a sequence put it at the beginning
@@ -691,10 +777,10 @@
         //
         // this is important because the way these are processed expects
         // the sequence ones to come first
-        _callbacks[key][sequenceName ? 'unshift' : 'push']({
+        _callbacks[info.key][sequenceName ? 'unshift' : 'push']({
             callback: callback,
-            modifiers: modifiers,
-            action: action,
+            modifiers: info.modifiers,
+            action: info.action,
             seq: sequenceName,
             level: level,
             combo: combination
@@ -716,9 +802,9 @@
     }
 
     // start!
-    _addEvent(document, 'keypress', _handleKey);
-    _addEvent(document, 'keydown', _handleKey);
-    _addEvent(document, 'keyup', _handleKey);
+    _addEvent(document, 'keypress', _handleKeyEvent);
+    _addEvent(document, 'keydown', _handleKeyEvent);
+    _addEvent(document, 'keyup', _handleKeyEvent);
 
     var Mousetrap = {
 
@@ -772,7 +858,7 @@
          */
         trigger: function(keys, action) {
             if (_directMap[keys + ':' + action]) {
-                _directMap[keys + ':' + action]();
+                _directMap[keys + ':' + action]({}, keys);
             }
             return this;
         },
@@ -797,7 +883,7 @@
         * @param {Element} element
         * @return {boolean}
         */
-        stopCallback: function(e, element, combo) {
+        stopCallback: function(e, element) {
 
             // if the element has the class "mousetrap" then no need to stop
             if ((' ' + element.className + ' ').indexOf(' mousetrap ') > -1) {
@@ -806,7 +892,12 @@
 
             // stop for input, select, and textarea
             return element.tagName == 'INPUT' || element.tagName == 'SELECT' || element.tagName == 'TEXTAREA' || (element.contentEditable && element.contentEditable == 'true');
-        }
+        },
+
+        /**
+         * exposes _handleKey publicly so it can be overwritten by extensions
+         */
+        handleKey: _handleKey
     };
 
     // expose mousetrap to the global object

metadata

@@ -1,128 +1,124 @@
 --- !ruby/object:Gem::Specification
 name: mousetrap-rails
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Nick Kugaevsky
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURNRENDQWhpZ0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREErTVEwd0N3WURWUVFEREFSdWFX
-  TnIKTVJrd0Z3WUtDWkltaVpQeUxHUUJHUllKYTNWbllXVjJjMnQ1TVJJd0VB
-  WUtDWkltaVpQeUxHUUJHUllDY25VdwpIaGNOTVRNd01UTXhNVGd4TWpNd1do
-  Y05NVFF3TVRNeE1UZ3hNak13V2pBK01RMHdDd1lEVlFRRERBUnVhV05yCk1S
-  a3dGd1lLQ1pJbWlaUHlMR1FCR1JZSmEzVm5ZV1YyYzJ0NU1SSXdFQVlLQ1pJ
-  bWlaUHlMR1FCR1JZQ2NuVXcKZ2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJ
-  QkR3QXdnZ0VLQW9JQkFRQzNTUzAxcnNJNU4zRVVHM2JTbmZJMgpwcjRFeHg5
-  Z0tDQlM1SXhWN090K3BRMnBzSWlXb2VuYVM0ZlMyZnNtdmxlOTJDbEV4M05i
-  VXFueHhHREVTMEViCkZrTkh5QUg5VndPMzZ2UzBsb052L094MnNTYWxlVU5W
-  M0pkdmNQMUdtM3hHdG45S1dOY3B1QXdQZk1sNUJTWWcKSzRXVTh6SWtiTGx3
-  bXJPNmg4NUlZWnJEd3FnaGI2T0NPd2hiNTZkNGJ5am9KRTI1YnJVeEVUeEdW
-  ZHN1VkNEcgpFUXJvUytEMkJpTUFFZHdKY24vUGVwTXgzbHQrdGVacmpVb2Vp
-  NVVYSWNuWjI4VVlTbm1Yalhua3lTbFBYelJWCnNpTHdVTUFnR3U2NjVodVVF
-  NVM4aWRXN29oU0hUSnYva0g5OEJvaVdpN2dpOUhGTXo0T0pNTWVSNXJaazc2
-  UWwKQWdNQkFBR2pPVEEzTUFrR0ExVWRFd1FDTUFBd0hRWURWUjBPQkJZRUZD
-  ZElLa0I5bForY29tMHdMQmhMUURXZQpZbmJ2TUFzR0ExVWREd1FFQXdJRXNE
-  QU5CZ2txaGtpRzl3MEJBUVVGQUFPQ0FRRUFOT3ViRmRkcHpNWEpmbFB2CnZY
-  WG5XWFl2WksyZXRTeHp3ZXdYWE9oY2J6d1N4ZFUwVDROYktjcmxobEZialVE
-  aC94RjRRemMxZEI5T0ZHOXIKZmZJVUt2MEp0RXlHTS9tT2FJU3NOcCtvWVVs
-  WHhYTE5Pc1g4TFQxciszMzd0UTYyN0dvWC9aMFJMNXU4TXo2UQpLWlVKaEdR
-  S05uSXA2Umt6NnNwNFpoMmFxVEx0OEJERUE4NmtPKzB2NExhVkxxRkVtTFR5
-  cGY3QzU2OFJUWWxtCk44TGFSRVFNTTVZZHZDSVlXczVDNmlOUlZhRGhUOGJr
-  dVdOaHRCaXMwSDdZRkFmc1cxcm45bnA4T1E3blkyYXoKOGROUXJCbEt6Yy9S
-  THdHR0ZUMWdqelZsSWI3L3h0TmRNZEpRNkp3eWxqU0o3MFBiS0FBemdCUmRE
-  TFB0OUJXdAozQUg5bXc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-02-08 00:00:00.000000000 Z
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MQ0wCwYDVQQDDARuaWNr
+  MRkwFwYKCZImiZPyLGQBGRYJa3VnYWV2c2t5MRIwEAYKCZImiZPyLGQBGRYCcnUw
+  HhcNMTMwMTMxMTgxMjMwWhcNMTQwMTMxMTgxMjMwWjA+MQ0wCwYDVQQDDARuaWNr
+  MRkwFwYKCZImiZPyLGQBGRYJa3VnYWV2c2t5MRIwEAYKCZImiZPyLGQBGRYCcnUw
+  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3SS01rsI5N3EUG3bSnfI2
+  pr4Exx9gKCBS5IxV7Ot+pQ2psIiWoenaS4fS2fsmvle92ClEx3NbUqnxxGDES0Eb
+  FkNHyAH9VwO36vS0loNv/Ox2sSaleUNV3JdvcP1Gm3xGtn9KWNcpuAwPfMl5BSYg
+  K4WU8zIkbLlwmrO6h85IYZrDwqghb6OCOwhb56d4byjoJE25brUxETxGVdsuVCDr
+  EQroS+D2BiMAEdwJcn/PepMx3lt+teZrjUoei5UXIcnZ28UYSnmXjXnkySlPXzRV
+  siLwUMAgGu665huUE5S8idW7ohSHTJv/kH98BoiWi7gi9HFMz4OJMMeR5rZk76Ql
+  AgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFCdIKkB9lZ+com0wLBhLQDWe
+  YnbvMAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEANOubFddpzMXJflPv
+  vXXnWXYvZK2etSxzwewXXOhcbzwSxdU0T4NbKcrlhlFbjUDh/xF4Qzc1dB9OFG9r
+  ffIUKv0JtEyGM/mOaISsNp+oYUlXxXLNOsX8LT1r+337tQ627GoX/Z0RL5u8Mz6Q
+  KZUJhGQKNnIp6Rkz6sp4Zh2aqTLt8BDEA86kO+0v4LaVLqFEmLTypf7C568RTYlm
+  N8LaREQMM5YdvCIYWs5C6iNRVaDhT8bkuWNhtBis0H7YFAfsW1rn9np8OQ7nY2az
+  8dNQrBlKzc/RLwGGFT1gjzVlIb7/xtNdMdJQ6JwyljSJ70PbKAAzgBRdDLPt9BWt
+  3AH9mw==
+  -----END CERTIFICATE-----
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 3.2.12
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.11
-  prerelease: false
+        version: 3.2.12
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.5
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.13.0
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
-  prerelease: false
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: genspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.7
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.7
-  prerelease: false
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.1
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Mousetrap is a javascript library for handling keyboard shortcuts in
   your web applications. This gem integrates Mousetrap with Rails asset pipeline for
   easy of use.
-email:
-- nick@kugaevsky.ru
+email: nick@kugaevsky.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -189,35 +185,28 @@ homepage: http://kugaevsky.github.com/mousetrap-rails
 licenses:
 - MIT
 - Apache
-post_install_message: ! "\n\e[33mRemember to run generator to generate sample file
-  and include mousetrap-rails with Rails Asset Pipeline\e[0m\n\n    \e[32m$ rails
-  generate mousetrap:install \e[0m\n\n"
+metadata: {}
+post_install_message: "\n\e[33mRemember to run generator to generate sample file and
+  include mousetrap-rails with Rails Asset Pipeline\e[0m\n\n    \e[32m$ rails generate
+  mousetrap:install \e[0m\n\n"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 3850591978535415950
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 3850591978535415950
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Integrate Mousetrap javascript library with Rails Asset Pipeline
 test_files:
 - spec/dummy/.rspec