From: Zachary Vance <vanceza@gmail.com>
Date: Wed, 20 May 2015 23:59:56 +0000 (-0700)
Subject: Resolve 'mousetrap bug' as user error on my part around rendering of contenteditable... 
X-Git-Url: https://git.za3k.com/?a=commitdiff_plain;h=a9d55b61e93b3d15a0de4430792b6db2efc2c30b;p=flowy.git

Resolve 'mousetrap bug' as user error on my part around rendering of contenteditable by replacing it each time
---

diff --git a/Gruntfile.js b/Gruntfile.js
index af913ed..9de876f 100644
--- 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 8ab18e5..15958a4 100644
--- 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 a5111ab..b98be73 100644
--- 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 a990480..6fdd079 100644
--- 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 305e5ec..e57faf1 100644
--- 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
  */