summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/MediaEditor.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-07-14 18:04:21 -0400
committerJules Laplace <jules@okfoc.us>2014-07-14 18:15:09 -0400
commit7ded9f91d3f3ab538425122be07f7436275b9b8d (patch)
tree1dd14ff86746d86b27bd6796b8843cb0e7507c66 /public/assets/javascripts/ui/editor/MediaEditor.js
parent9fe187effeaf4a2e6205e2f1f52b32b8823f4f10 (diff)
play button and stuff on the viewer
Diffstat (limited to 'public/assets/javascripts/ui/editor/MediaEditor.js')
-rw-r--r--public/assets/javascripts/ui/editor/MediaEditor.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index aea78aa..4e1132c 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -5,6 +5,7 @@ var MediaEditor = FormView.extend({
events: {
"click .playButton": "togglePlaying",
"mousedown [name=keyframe]": "stopPropagation",
+ "mousedown": "stopPropagation",
"change [name=keyframe]": "seek",
"change [name=autoplay]": "setAutoplay",
"change [name=loop]": "setLoop",
@@ -17,7 +18,6 @@ var MediaEditor = FormView.extend({
this.$name = this.$("[name=name]")
this.$description = this.$("[name=description]")
- this.$autoplay = this.$("[name=autoplay]")
// image fields
this.$widthDimension = this.$("[name=width]")
@@ -79,7 +79,13 @@ var MediaEditor = FormView.extend({
break
}
+ },
+ hide: function(scenery){
+ if (this.scenery) {
+ this.unbind()
+ }
+ this.toggle(false)
},
seek: function(){
@@ -88,7 +94,6 @@ var MediaEditor = FormView.extend({
this.scenery.media.keyframe = n
},
-
setAutoplay: function(){
var checked = this.$autoplay.prop('checked')
this.scenery.media.autoplay = checked