summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/MediaEditor.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-08-14 15:24:34 -0400
committerJules Laplace <jules@okfoc.us>2014-08-14 15:24:34 -0400
commit31907c69cc192a23bb409adf5c438ed708db0842 (patch)
tree516a88386f96606b1890c83e5083fdb943582a68 /public/assets/javascripts/ui/editor/MediaEditor.js
parentc4c45b64c2c0fc109f4c21effe7f73f5c46a1ae9 (diff)
parent63da3ba331aa3d9714151ba5f502e6e1851d75bb (diff)
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor/MediaEditor.js')
-rw-r--r--public/assets/javascripts/ui/editor/MediaEditor.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index e3a8f2e..cc924da 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -4,6 +4,7 @@ var MediaEditor = FormView.extend({
events: {
"keydown": 'stopPropagation',
+ "focus [name]": "clearMinotaur",
"click [data-role=play-media]": "togglePaused",
"mousedown [name=keyframe]": "stopPropagation",
"mousedown": "stopPropagation",