summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/TextEditor.js
diff options
context:
space:
mode:
authorryderr <r@okfoc.us>2014-11-13 12:02:48 -0500
committerryderr <r@okfoc.us>2014-11-13 12:02:48 -0500
commit61eebaa5c3ef0d839c00c4d512b402ba71f97454 (patch)
treece6ba3158d4debd2b433c352da7d4ec50f1679dc /public/assets/javascripts/ui/editor/TextEditor.js
parentf2b8c713c49fbad37e3d128701fb55c1cc8c9d92 (diff)
parent28ade7d7f9e1c8e35de713a04303538140e22ea9 (diff)
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/ui/editor/TextEditor.js')
-rw-r--r--public/assets/javascripts/ui/editor/TextEditor.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 33b5386..2949943 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -75,11 +75,13 @@ var TextEditor = FormView.extend({
if (this.tainted) {
Minotaur.watch( app.router.editorView.settings )
}
-
if (this.scenery.mx) {
this.scenery.mx.bound = false
this.scenery.mx.el.classList.remove("picked")
}
+ if (! this.scenery.media || ! this.scenery.media.description || this.scenery.media.description == "") {
+ this.scenery.remove()
+ }
}
this.tainted = false
this.scenery = null
@@ -143,6 +145,7 @@ var TextEditor = FormView.extend({
destroy: function(){
this.tainted = false
this.scenery.remove()
+ this.hide()
},
})