diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-06 23:41:04 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-06 23:41:04 -0400 |
| commit | 9dccd8305b57a8d19caac960aa6f8528f208baf6 (patch) | |
| tree | 7a0a1aae626abcde6722d054b97388e5a3f1814e /public/assets/javascripts/ui/editor/EditorView.js | |
| parent | c4793f4c649425d0a4b09ce7244edd7ceb69f335 (diff) | |
| parent | 20b1d2787e71cb28c55187d42805407fef63d0e4 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor/EditorView.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorView.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js index 83db532..67687fe 100644 --- a/public/assets/javascripts/ui/editor/EditorView.js +++ b/public/assets/javascripts/ui/editor/EditorView.js @@ -42,11 +42,19 @@ var EditorView = View.extend({ }, pick: function(scenery){ - this.mediaEditor.pick(scenery) + if (scenery.type == "text") { + this.mediaEditor.hide() + this.textEditor.pick(scenery) + } + else { + this.textEditor.hide() + this.mediaEditor.pick(scenery) + } }, hideExtras: function(){ this.mediaEditor.hide() + this.textEditor.hide() Scenery.resize.hide() Scenery.hovering = false } |