Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

1 files changed, 7 insertions, 0 deletions

diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 27c3731c..c7288d28 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,
+    F6:117,
     PLUS:187,
     MINUS:189
 };
@@ -215,6 +216,12 @@ exports.KeyboardMediator = Montage.create(Component, {
                     return;
                 }
 
+                // F6 keyboard shortcut to add a keyframe to the timeline
+                if (evt.keyCode == Keyboard.F6) {
+                    this.application.ninja.timeline.handleKeyframeShortcut();
+                    return;
+                }
+
                 // Check if cmd+a/ctrl+a for Select All
                 if((evt.keyCode == Keyboard.A) && (evt.ctrlKey || evt.metaKey)) {
                     NJevent("selectAll");