Resolve 'mousetrap bug' as user error on my part around rendering of contenteditable...

diff --git a/Gruntfile.js b/Gruntfile.js
index af913ed39c0cf4eb217d84b3fb76836261e4124c..9de876fb18f9516a868ec5d0ca2bd48327d744cb 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -5,12 +5,12 @@ module.exports = function(grunt) {
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
     jshint: {
-      files: ['Gruntfile.js', 'src/**/*.js', 'test/**/*.js'],
+      files: ['Gruntfile.js', 'src/**/*.js', 'test/**/*.js', '!src/library/mousetrap.min.js'],
       options: {
         globals: {
           jQuery: true,
         }
-      }
+      },
     },
     watch: {
       files: ['<%= jshint.files %>', '<%= concat.css.src %>', '<%= copy.main.files[0].src %>'],

diff --git a/dist/flowy.js b/dist/flowy.js
index 8ab18e5da8887caca908d7dca9d82659340af018..15958a4763df238e9c111d835243784d93fb0424 100644 (file)
--- a/dist/flowy.js
+++ b/dist/flowy.js
@@ -61,7 +61,6 @@ function setRangeAtMarker(markerElement, options) {
 }
 
 // TODO: More documentation
-// TODO: Removing objects/shortcuts/rebinding won't work until this bug is fixed in mousetrap: https://github.com/ccampbell/mousetrap/issues/267
 
 // firstShortcut = Shortcut.registerShortcut("Control + k", function() { console.log("Shortcut pressed."); });
 // firstShortcut.rebind("Control + m");
@@ -310,7 +309,7 @@ var Shortcut = (function(document, _) {
 
 /**
  * @depend ../library/cursorToEnd.js
- //* @depend ../library/viewShortcuts.js
+ * @depend ../library/viewShortcuts.js
  */
 
 

diff --git a/dist/flowy.unwrapped.js b/dist/flowy.unwrapped.js
index a5111ab7af0db4e3e47358cbe099e7fcafcbb1a6..b98be73b068413248b8115b1ff81b7f02d254f50 100644 (file)
--- a/dist/flowy.unwrapped.js
+++ b/dist/flowy.unwrapped.js
@@ -60,7 +60,6 @@ function setRangeAtMarker(markerElement, options) {
 }
 
 // TODO: More documentation
-// TODO: Removing objects/shortcuts/rebinding won't work until this bug is fixed in mousetrap: https://github.com/ccampbell/mousetrap/issues/267
 
 // firstShortcut = Shortcut.registerShortcut("Control + k", function() { console.log("Shortcut pressed."); });
 // firstShortcut.rebind("Control + m");
@@ -309,7 +308,7 @@ var Shortcut = (function(document, _) {
 
 /**
  * @depend ../library/cursorToEnd.js
- //* @depend ../library/viewShortcuts.js
+ * @depend ../library/viewShortcuts.js
  */
 
 

diff --git a/src/library/shortcut.js b/src/library/shortcut.js
index a990480dab0671346614d7545c3415c5b8e2213f..6fdd0793b9158cf6da51ade3d28344c9e419298f 100644 (file)
--- a/src/library/shortcut.js
+++ b/src/library/shortcut.js
@@ -1,5 +1,4 @@
 // TODO: More documentation
-// TODO: Removing objects/shortcuts/rebinding won't work until this bug is fixed in mousetrap: https://github.com/ccampbell/mousetrap/issues/267
 
 // firstShortcut = Shortcut.registerShortcut("Control + k", function() { console.log("Shortcut pressed."); });
 // firstShortcut.rebind("Control + m");

diff --git a/src/views/todo.js b/src/views/todo.js
index 305e5ec99d58a88e6a3299ff9de1e963dd0cad8b..e57faf16d3b8308f11d9c1a06008b842987e5402 100644 (file)
--- a/src/views/todo.js
+++ b/src/views/todo.js
@@ -1,6 +1,6 @@
 /**
  * @depend ../library/cursorToEnd.js
- //* @depend ../library/viewShortcuts.js
+ * @depend ../library/viewShortcuts.js
  */