diff options
author | Valerio Virgillito | 2012-06-26 09:14:30 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-26 09:14:30 -0700 |
commit | b4ca7c50790381bddeebb417c1d0477344c77cff (patch) | |
tree | 0c8d536cb0e75ceaf757b9ae2e7b5df85fc8556c /js/mediators | |
parent | d2e88bb251efb29f13911942f1f91101715c727e (diff) | |
parent | 8b46c251664a45039db355075bce85ddfd345269 (diff) | |
download | ninja-b4ca7c50790381bddeebb417c1d0477344c77cff.tar.gz |
Merge pull request #335 from imix23ways/Timeline-bugfix1
Timeline fix - reopen Position and Size keyframe correctly
Diffstat (limited to 'js/mediators')
-rwxr-xr-x | js/mediators/keyboard-mediator.js | 7 |
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 = { | |||
50 | X:88, | 50 | X:88, |
51 | Y:89, | 51 | Y:89, |
52 | Z:90, | 52 | Z:90, |
53 | F5:116, | ||
53 | F6:117, | 54 | F6:117, |
54 | PLUS:187, | 55 | PLUS:187, |
55 | MINUS:189 | 56 | MINUS:189 |
@@ -218,7 +219,11 @@ exports.KeyboardMediator = Montage.create(Component, { | |||
218 | 219 | ||
219 | // F6 keyboard shortcut to add a keyframe to the timeline | 220 | // F6 keyboard shortcut to add a keyframe to the timeline |
220 | if (evt.keyCode == Keyboard.F6) { | 221 | if (evt.keyCode == Keyboard.F6) { |
221 | this.application.ninja.timeline.handleKeyframeShortcut(); | 222 | this.application.ninja.timeline.handleKeyframeShortcut("insert"); |
223 | return; | ||
224 | } | ||
225 | if (evt.keyCode == Keyboard.F5) { | ||
226 | this.application.ninja.timeline.handleKeyframeShortcut("remove"); | ||
222 | return; | 227 | return; |
223 | } | 228 | } |
224 | 229 | ||