Merge branch 'refs/heads/Ninja-Internal' into Color

1 files changed, 6 insertions, 1 deletions

diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index c7288d28..18568619 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -50,6 +50,7 @@ var Keyboard = exports.Keyboard = {
     X:88,
     Y:89,
     Z:90,
+    F5:116,
     F6:117,
     PLUS:187,
     MINUS:189
@@ -218,7 +219,11 @@ exports.KeyboardMediator = Montage.create(Component, {
 
                 // F6 keyboard shortcut to add a keyframe to the timeline
                 if (evt.keyCode == Keyboard.F6) {
-                    this.application.ninja.timeline.handleKeyframeShortcut();
+                    this.application.ninja.timeline.handleKeyframeShortcut("insert");
+                    return;
+                }
+                if (evt.keyCode == Keyboard.F5) {
+                    this.application.ninja.timeline.handleKeyframeShortcut("remove");
                     return;
                 }