diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-05 18:13:59 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-05 18:13:59 -0500 |
| commit | 22c4fd94cd4b3f5f881f0ad91597b7c208e89eff (patch) | |
| tree | 910f9273c2de0c49b77e411b1c0a6cf5efd8c108 /public/assets/javascripts/ui/editor/MediaEditor.js | |
| parent | 64748a6d55f1e4d08270367767b631b724833b19 (diff) | |
| parent | 69cf6a5005dcd0e7fcebcc1db9bd290b5fb63ed1 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor/MediaEditor.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/MediaEditor.js | 9 |
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 }, }) |