summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/MediaEditor.js
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/ui/editor/MediaEditor.js')
-rw-r--r--public/assets/javascripts/ui/editor/MediaEditor.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index 9b81db1..db5878f 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -161,7 +161,7 @@ var MediaEditor = FormView.extend({
unbind: function(){
if (this.scenery) {
- if (this.tainted) {
+ if (this.tainted && this.scenery.media) {
this.scenery.media.title = this.$name.val()
this.scenery.media.description = this.$description.val()
Minotaur.watch( app.router.editorView.settings )
@@ -178,8 +178,11 @@ var MediaEditor = FormView.extend({
destroy: function(){
var scenery = this.scenery
this.hide()
- Scenery.remove(scenery.id)
- Scenery.resize.hide()
+
+ scenery.remove()
+
+ this.tainted = false
+ this.scenery = null
},
})