diff options
author | Kruti Shah | 2012-07-19 10:08:07 -0700 |
---|---|---|
committer | Kruti Shah | 2012-07-19 10:08:07 -0700 |
commit | 5741fbc0a2eb1a43017b76406056bc98cdf00297 (patch) | |
tree | c6b478666eab9e637039467d70e948e1e0e46882 /js/mediators/keyboard-mediator.js | |
parent | 0b899ad6cec5e4626dfa32230be7c04d22d4f820 (diff) | |
parent | 142dc59794769ad783ab050b27b4f56ac5773afb (diff) | |
download | ninja-5741fbc0a2eb1a43017b76406056bc98cdf00297.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/mediators/keyboard-mediator.js')
-rwxr-xr-x | js/mediators/keyboard-mediator.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js index 36bc86fd..f71356b6 100755 --- a/js/mediators/keyboard-mediator.js +++ b/js/mediators/keyboard-mediator.js | |||
@@ -264,7 +264,7 @@ exports.KeyboardMediator = Montage.create(Component, { | |||
264 | 264 | ||
265 | 265 | ||
266 | if((evt.keyCode == Keyboard.ENTER) && (evt.ctrlKey || evt.metaKey)) { | 266 | if((evt.keyCode == Keyboard.ENTER) && (evt.ctrlKey || evt.metaKey)) { |
267 | this.application.ninja.executeChromePreview(); | 267 | this.application.ninja.handleExecutePreview(); |
268 | return; | 268 | return; |
269 | } | 269 | } |
270 | 270 | ||