mousetrap-rails 0.0.7 → 0.0.8

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.0.9.wip
+
+## v0.0.8
+
+* update rspec-rails version development dependency
+* update mousetrap.js to 1.2.2
+
 ## v0.0.7
 
 * update mousetrap.js to 1.2.1

data/README.md

@@ -1,4 +1,4 @@
-# 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)](http://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 [![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](https://github.com/ccampbell/mousetrap) is a javascript library for handling keyboard shortcuts in your web applications written by [Craig Campbell](http://craig.is/).
 

data/lib/mousetrap-rails/version.rb

@@ -1,5 +1,5 @@
 module Mousetrap
   module Rails
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/mousetrap-rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rails', '~> 3.2.1'
   gem.add_development_dependency 'sqlite3', '~> 1.3.5'
-  gem.add_development_dependency 'rspec-rails', '~> 2.11.0'
+  gem.add_development_dependency 'rspec-rails', '~> 2.12.0'
   gem.add_development_dependency 'genspec', '~> 0.2.7'
   gem.add_development_dependency 'sass', '~> 3.2.1'
 

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.2.1
+ * @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
@@ -255,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;
             }
@@ -270,7 +270,7 @@
         }
 
         if (!active_sequences) {
-            _inside_sequence = false;
+            _sequence_type = false;
         }
     }
 
@@ -410,6 +410,7 @@
         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
@@ -423,6 +424,10 @@
             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, callbacks[i].combo);
@@ -431,7 +436,7 @@
 
             // 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) {
+            if (!processed_sequence_callback && !_sequence_type) {
                 _fireCallback(callbacks[i].callback, e, callbacks[i].combo);
             }
         }
@@ -439,8 +444,8 @@
         // 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);
         }
     }
 
@@ -574,7 +579,7 @@
          * @returns void
          */
         var _increaseSequence = function(e) {
-                _inside_sequence = action;
+                _sequence_type = action;
                 ++_sequence_levels[combo];
                 _resetSequenceTimer();
             },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mousetrap-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: genspec
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2443179637036711328
+      hash: -3047934806921062666
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2443179637036711328
+      hash: -3047934806921062666
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24