diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-15 11:55:32 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-15 11:55:32 -0500 |
| commit | 05b73f5e56fd728454faac8e97d57786fdfb3b51 (patch) | |
| tree | c469a63a5e0d5b12ee628f314068cf92cc90aee1 /public/assets/javascripts/ui/editor/TextEditor.js | |
| parent | b3f8d220c650482b117d6577b85bd7ef07e533df (diff) | |
| parent | 84d606cc4c56778ae7e6b8b7d86e100131717a53 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor/TextEditor.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/TextEditor.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/editor/TextEditor.js b/public/assets/javascripts/ui/editor/TextEditor.js index d897f91..53d5b9f 100644 --- a/public/assets/javascripts/ui/editor/TextEditor.js +++ b/public/assets/javascripts/ui/editor/TextEditor.js @@ -96,6 +96,7 @@ var TextEditor = FormView.extend({ unbind: function(){ if (this.scenery) { + this.scenery.focused = false if (this.tainted) { Minotaur.watch( app.router.editorView.settings ) } @@ -119,7 +120,7 @@ var TextEditor = FormView.extend({ }, pick: function(scenery){ - if (this.scenery) { + if (this.scenery && scenery !== this.scenery) { this.unbind() } |