mousetrapjs 1.4.1 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a05b6045de34fc7a0ad351cfbde3c00199238455
-  data.tar.gz: 8c923714b26069877b456fffbfd66b5fbefa4485
+  metadata.gz: b371a2c09b8b414d06a0f6c8929c515ea3878065
+  data.tar.gz: daa31acbc49586adab1ef383ec2afc2f4bb9aa27
 SHA512:
-  metadata.gz: 1c147ad6eeb0ab7b660fdaa2ff6d968ef4245f3bad8fda3f0281221bb3cb44e13ca21f4585869a3e02d98ed582c34d5325d8cdde16801d17383f52be4f89cf7e
-  data.tar.gz: d3a340ed7919ea2731f88493e229a6815ac0ae8b861e6a087870377d39ff52a9fa49b64c5fdb207e9c0fb66fffb961e6ae7688d614f3d9cdb8d2cc2466c7622e
+  metadata.gz: 3dc22e20ef8425ac45ff35ff66d057f11f4391e46fd48b50aedd1f82b341a66de13d8bc30f7147032588fa6a31e15f398db504d623024ef4a16678eb39f3d4a2
+  data.tar.gz: f82b161215434176c74bde304156a07891d0acfd83b41d053792a65812d524a75ab6c6d68982b1f98ce63b8cf0aebf45fe48170b13f95fd46a92a887160b00f6

data/README.md

@@ -1,3 +1,4 @@
+[![Stories in Ready](https://badge.waffle.io/luizkowalski/mousetrapjs.png?label=ready)](https://waffle.io/luizkowalski/mousetrapjs)  
 # MousetrapJS
 Mousetrap is a simple library for handling keyboard shortcuts in Javascript, with no external dependencies.
 Documentation can be found in [here](http://craig.is/killing/mice).

data/lib/mousetrapjs/version.rb

@@ -1,3 +1,3 @@
 module Mousetrapjs
-  VERSION = "1.4.1"
+  VERSION = "1.4.6"
 end

data/vendor/assets/javascripts/mousetrap.js

@@ -17,10 +17,10 @@
  * Mousetrap is a simple keyboard shortcut library for Javascript with
  * no external dependencies
  *
- * @version 1.4.1
+ * @version 1.4.6
  * @url craig.is/killing/mice
  */
-(function() {
+(function(window, document, undefined) {
 
     /**
      * mapping of special keycodes to their corresponding keys
@@ -174,6 +174,13 @@
          */
         _ignoreNextKeyup = false,
 
+        /**
+         * temporary state where we will ignore the next keypress
+         *
+         * @type {boolean}
+         */
+        _ignoreNextKeypress = false,
+
         /**
          * are we currently inside of a sequence?
          * type of action ("keyup" or "keydown" or "keypress") or false
@@ -395,6 +402,36 @@
         return modifiers;
     }
 
+    /**
+     * prevents default for this event
+     *
+     * @param {Event} e
+     * @returns void
+     */
+    function _preventDefault(e) {
+        if (e.preventDefault) {
+            e.preventDefault();
+            return;
+        }
+
+        e.returnValue = false;
+    }
+
+    /**
+     * stops propogation for this event
+     *
+     * @param {Event} e
+     * @returns void
+     */
+    function _stopPropagation(e) {
+        if (e.stopPropagation) {
+            e.stopPropagation();
+            return;
+        }
+
+        e.cancelBubble = true;
+    }
+
     /**
      * actually calls the callback function
      *
@@ -405,24 +442,16 @@
      * @param {Event} e
      * @returns void
      */
-    function _fireCallback(callback, e, combo) {
+    function _fireCallback(callback, e, combo, sequence) {
 
         // if this event should not happen stop here
-        if (Mousetrap.stopCallback(e, e.target || e.srcElement, combo)) {
+        if (Mousetrap.stopCallback(e, e.target || e.srcElement, combo, sequence)) {
             return;
         }
 
         if (callback(e, combo) === false) {
-            if (e.preventDefault) {
-                e.preventDefault();
-            }
-
-            if (e.stopPropagation) {
-                e.stopPropagation();
-            }
-
-            e.returnValue = false;
-            e.cancelBubble = true;
+            _preventDefault(e);
+            _stopPropagation(e);
         }
     }
 
@@ -474,7 +503,7 @@
 
                 // keep a list of which sequences were matches for later
                 doNotReset[callbacks[i].seq] = 1;
-                _fireCallback(callbacks[i].callback, e, callbacks[i].combo);
+                _fireCallback(callbacks[i].callback, e, callbacks[i].combo, callbacks[i].seq);
                 continue;
             }
 
@@ -496,9 +525,22 @@
         // 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)) {
+        //
+        // also if you have a sequence such as "ctrl+b a" then pressing the
+        // "b" key will trigger a "keypress" and a "keydown"
+        //
+        // the "keydown" is expected when there is a modifier, but the
+        // "keypress" ends up matching the _nextExpectedAction since it occurs
+        // after and that causes the sequence to reset
+        //
+        // we ignore keypresses in a sequence that directly follow a keydown
+        // for the same character
+        var ignoreThisKeypress = e.type == 'keypress' && _ignoreNextKeypress;
+        if (e.type == _nextExpectedAction && !_isModifier(character) && !ignoreThisKeypress) {
             _resetSequences(doNotReset);
         }
+
+        _ignoreNextKeypress = processedSequenceCallback && e.type == 'keydown';
     }
 
     /**
@@ -522,7 +564,8 @@
             return;
         }
 
-        if (e.type == 'keyup' && _ignoreNextKeyup == character) {
+        // need to use === for the character check because the character can be 0
+        if (e.type == 'keyup' && _ignoreNextKeyup === character) {
             _ignoreNextKeyup = false;
             return;
         }
@@ -891,7 +934,7 @@
             }
 
             // stop for input, select, and textarea
-            return element.tagName == 'INPUT' || element.tagName == 'SELECT' || element.tagName == 'TEXTAREA' || (element.contentEditable && element.contentEditable == 'true');
+            return element.tagName == 'INPUT' || element.tagName == 'SELECT' || element.tagName == 'TEXTAREA' || element.isContentEditable;
         },
 
         /**
@@ -907,4 +950,4 @@
     if (typeof define === 'function' && define.amd) {
         define(Mousetrap);
     }
-}) ();
+}) (window, document);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mousetrapjs
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.6
 platform: ruby
 authors:
 - Luiz Eduardo Kowalski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Gem for Mousetrap, a simple library for handling keyboard shortcuts in
   Javascript
@@ -18,7 +18,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -36,17 +36,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mousetrap is a simple library for handling keyboard shortcuts in Javascript