diff options
| author | ryderr <r@okfoc.us> | 2014-10-02 12:26:41 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-02 12:26:41 -0400 |
| commit | 07c4bbecdad6ba4522de09d52884e1ad790fff87 (patch) | |
| tree | 1e276d3eae7dbf564b11b1388972cadd905dab3f /public/assets/javascripts/ui/editor/EditorView.js | |
| parent | 7767259acb90375f55b15ad906e3d434219d43fc (diff) | |
| parent | 52cabd89039fa852cbd59db9b8bfcb29e1e0a170 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/ui/editor/EditorView.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorView.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js index 6636a8c..83db532 100644 --- a/public/assets/javascripts/ui/editor/EditorView.js +++ b/public/assets/javascripts/ui/editor/EditorView.js @@ -16,6 +16,7 @@ var EditorView = View.extend({ this.mediaEditor = new MediaEditor ({ parent: this }) this.wallpaperPicker = new WallpaperPicker ({ parent: this }) this.lightControl = new LightControl ({ parent: this }) + this.textEditor = new TextEditor ({ parent: this }) this.collaborators = new Collaborators ({ parent: this }) }, |