mousetrapjs 0.1.0 → 0.1.2.2

data/lib/mousetrapjs/version.rb

@@ -1,3 +1,3 @@
 module Mousetrapjs
-  VERSION = "0.1.0"
+  VERSION = "0.1.2.2"
 end

data/vendor/assets/javascripts/mousetrap.js

@@ -16,7 +16,7 @@
  * Mousetrap is a simple keyboard shortcut library for Javascript with
  * no external dependencies
  *
- * @version 1.1.3
+ * @version 1.2.2
  * @url craig.is/killing/mice
  */
 (function() {
@@ -178,7 +178,7 @@
          *
          * @type {boolean|string}
          */
-        _inside_sequence = false;
+        _sequence_type = false;
 
     /**
      * loop through the f keys, f1 to f19 and add them to the map
@@ -205,7 +205,8 @@
      */
     function _addEvent(object, type, callback) {
         if (object.addEventListener) {
-            return object.addEventListener(type, callback, false);
+            object.addEventListener(type, callback, false);
+            return;
         }
 
         object.attachEvent('on' + type, callback);
@@ -237,25 +238,6 @@
         return String.fromCharCode(e.which).toLowerCase();
     }
 
-    /**
-     * should we stop this event before firing off callbacks
-     *
-     * @param {Event} e
-     * @return {boolean}
-     */
-    function _stop(e) {
-        var element = e.target || e.srcElement,
-            tag_name = element.tagName;
-
-        // if the element has the class "mousetrap" then no need to stop
-        if ((' ' + element.className + ' ').indexOf(' mousetrap ') > -1) {
-            return false;
-        }
-
-        // stop for input, select, and textarea
-        return tag_name == 'INPUT' || tag_name == 'SELECT' || tag_name == 'TEXTAREA' || (element.contentEditable && element.contentEditable == 'true');
-    }
-
     /**
      * checks if two arrays are equal
      *
@@ -273,14 +255,14 @@
      * @param {Object} do_not_reset
      * @returns void
      */
-    function _resetSequences(do_not_reset) {
+    function _resetSequences(do_not_reset, max_level) {
         do_not_reset = do_not_reset || {};
 
         var active_sequences = false,
             key;
 
         for (key in _sequence_levels) {
-            if (do_not_reset[key]) {
+            if (do_not_reset[key] && _sequence_levels[key] > max_level) {
                 active_sequences = true;
                 continue;
             }
@@ -288,7 +270,7 @@
         }
 
         if (!active_sequences) {
-            _inside_sequence = false;
+            _sequence_type = false;
         }
     }
 
@@ -396,8 +378,14 @@
      * @param {Event} e
      * @returns void
      */
-    function _fireCallback(callback, e) {
-        if (callback(e) === false) {
+    function _fireCallback(callback, e, combo) {
+
+        // if this event should not happen stop here
+        if (Mousetrap.stopCallback(e, e.target || e.srcElement, combo)) {
+            return;
+        }
+
+        if (callback(e, combo) === false) {
             if (e.preventDefault) {
                 e.preventDefault();
             }
@@ -419,15 +407,10 @@
      * @returns void
      */
     function _handleCharacter(character, e) {
-
-        // if this event should not happen stop here
-        if (_stop(e)) {
-            return;
-        }
-
         var callbacks = _getMatches(character, _eventModifiers(e), e),
             i,
             do_not_reset = {},
+            max_level = 0,
             processed_sequence_callback = false;
 
         // loop through matching callbacks for this key event
@@ -441,24 +424,28 @@
             if (callbacks[i].seq) {
                 processed_sequence_callback = true;
 
+                // as we loop through keep track of the max
+                // any sequence at a lower level will be discarded
+                max_level = Math.max(max_level, callbacks[i].level);
+
                 // keep a list of which sequences were matches for later
                 do_not_reset[callbacks[i].seq] = 1;
-                _fireCallback(callbacks[i].callback, e);
+                _fireCallback(callbacks[i].callback, e, callbacks[i].combo);
                 continue;
             }
 
             // if there were no sequence matches but we are still here
             // that means this is a regular match so we should fire that
-            if (!processed_sequence_callback && !_inside_sequence) {
-                _fireCallback(callbacks[i].callback, e);
+            if (!processed_sequence_callback && !_sequence_type) {
+                _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 == _inside_sequence && !_isModifier(character)) {
-            _resetSequences(do_not_reset);
+        if (e.type == _sequence_type && !_isModifier(character)) {
+            _resetSequences(do_not_reset, max_level);
         }
     }
 
@@ -472,7 +459,9 @@
 
         // normalize e.which for key events
         // @see http://stackoverflow.com/questions/4285627/javascript-keycode-vs-charcode-utter-confusion
-        e.which = typeof e.which == "number" ? e.which : e.keyCode;
+        if (typeof e.which !== 'number') {
+            e.which = e.keyCode;
+        }
 
         var character = _characterFromEvent(e);
 
@@ -590,7 +579,7 @@
          * @returns void
          */
         var _increaseSequence = function(e) {
-                _inside_sequence = action;
+                _sequence_type = action;
                 ++_sequence_levels[combo];
                 _resetSequenceTimer();
             },
@@ -603,7 +592,7 @@
              * @returns void
              */
             _callbackAndReset = function(e) {
-                _fireCallback(callback, 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
@@ -650,7 +639,8 @@
         // 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) {
-            return _bindSequence(combination, sequence, callback, action);
+            _bindSequence(combination, sequence, callback, action);
+            return;
         }
 
         // take the keys from this pattern and figure out what the actual
@@ -727,7 +717,7 @@
     _addEvent(document, 'keydown', _handleKey);
     _addEvent(document, 'keyup', _handleKey);
 
-    var mousetrap = {
+    var Mousetrap = {
 
         /**
          * binds an event to mousetrap
@@ -797,14 +787,32 @@
             _callbacks = {};
             _direct_map = {};
             return this;
+        },
+
+       /**
+        * should we stop this event before firing off callbacks
+        *
+        * @param {Event} e
+        * @param {Element} element
+        * @return {boolean}
+        */
+        stopCallback: function(e, element, combo) {
+
+            // if the element has the class "mousetrap" then no need to stop
+            if ((' ' + element.className + ' ').indexOf(' mousetrap ') > -1) {
+                return false;
+            }
+
+            // stop for input, select, and textarea
+            return element.tagName == 'INPUT' || element.tagName == 'SELECT' || element.tagName == 'TEXTAREA' || (element.contentEditable && element.contentEditable == 'true');
         }
     };
 
     // expose mousetrap to the global object
-    window.Mousetrap = mousetrap;
+    window.Mousetrap = Mousetrap;
 
     // expose mousetrap as an AMD module
-    if (typeof define == 'function' && define.amd) {
-        define('mousetrap', function() { return mousetrap; });
+    if (typeof define === 'function' && define.amd) {
+        define(Mousetrap);
     }
 }) ();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mousetrapjs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-01 00:00:00.000000000 Z
+date: 2012-12-16 00:00:00.000000000 Z
 dependencies: []
 description: Gem for Mousetrap, a simple library for handling keyboard shortcuts in
   Javascript
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Mousetrap is a simple library for handling keyboard shortcuts in Javascript