summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryderr <r@okfoc.us>2014-09-29 18:41:05 -0400
committerryderr <r@okfoc.us>2014-09-29 18:41:05 -0400
commite3dc5edf35309eba36452bb8f06e5157e770033f (patch)
tree4e8bf8d2c1f2e7c59a0a59d87a4e1603aa2570ec
parent78630dc251eb179cb2b36de60979ebf323e7a2ba (diff)
parent1ce5766d7109a51a5c63b31f64fa4c176098f778 (diff)
Merge branch 'master' of github.com:okfocus/vvalls
-rw-r--r--public/assets/javascripts/ui/editor/MediaEditor.js12
1 files changed, 9 insertions, 3 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index 750cf41..2d32d4f 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -142,9 +142,15 @@ var MediaEditor = FormView.extend({
},
unbind: function(){
- if (this.scenery && this.scenery.mx) {
- this.scenery.mx.bound = false
- this.scenery.mx.el.classList.remove("picked")
+ if (this.scenery) {
+ this.scenery.media.title = this.$name.val()
+ this.scenery.media.description = this.$description.val()
+ Minotaur.watch( app.router.editorView.settings )
+
+ if (this.scenery.mx) {
+ this.scenery.mx.bound = false
+ this.scenery.mx.el.classList.remove("picked")
+ }
}
this.scenery = null
},