summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-10-06 16:07:21 -0400
committerJules Laplace <jules@okfoc.us>2014-10-06 16:47:14 -0400
commit1dae6e5dfce901cdadeebd2e191927dbc5a326f6 (patch)
treeeca6c31871ff40c6be5ce638b6c850eccc30955d /public/assets/javascripts/ui/editor
parentc19fbc87676404636a2f5df304ddd7875fc98e66 (diff)
bower: adding marked
Diffstat (limited to 'public/assets/javascripts/ui/editor')
-rw-r--r--public/assets/javascripts/ui/editor/MediaEditor.js10
-rw-r--r--public/assets/javascripts/ui/editor/TextEditor.js6
2 files changed, 10 insertions, 6 deletions
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index 0a4d894..9b81db1 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -160,10 +160,12 @@ var MediaEditor = FormView.extend({
},
unbind: function(){
- if (this.scenery && this.tainted) {
- this.scenery.media.title = this.$name.val()
- this.scenery.media.description = this.$description.val()
- Minotaur.watch( app.router.editorView.settings )
+ if (this.scenery) {
+ if (this.tainted) {
+ 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")
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js
index 0d082ca..3d3124b 100644
--- a/public/assets/javascripts/ui/editor/TextEditor.js
+++ b/public/assets/javascripts/ui/editor/TextEditor.js
@@ -55,8 +55,10 @@ var TextEditor = FormView.extend({
},
unbind: function(){
- if (this.scenery && this.tainted) {
- Minotaur.watch( app.router.editorView.settings )
+ if (this.scenery) {
+ if (this.tainted) {
+ Minotaur.watch( app.router.editorView.settings )
+ }
if (this.scenery.mx) {
this.scenery.mx.bound = false