diff options
| author | ryderr <r@okfoc.us> | 2014-11-17 11:23:53 -0500 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-11-17 11:23:53 -0500 |
| commit | 21e23e63e089685a558d2e5c74439e9de5c33c4f (patch) | |
| tree | 6ee8cf44e00aca897ec02d48a1e398c4e41092cb /public/assets/javascripts/ui/editor/TextEditor.js | |
| parent | 39fa1a5b835797deb4b28d7ba6faae766a979dca (diff) | |
| parent | 84d606cc4c56778ae7e6b8b7d86e100131717a53 (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.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() } |