diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-07 18:24:57 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-07 18:24:57 -0500 |
| commit | 5b801067f0da66191090465e72d1758826461fd3 (patch) | |
| tree | 8b02ce4443f7e5bbefb59c29ffa9219eaf02a56f /public/assets/javascripts/ui/editor/EditorView.js | |
| parent | 22c4fd94cd4b3f5f881f0ad91597b7c208e89eff (diff) | |
| parent | f246a18bf02d2476b5f2bbc87a563b997b384a2c (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/editor/EditorView.js')
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorView.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js index 2872ab9..3773366 100644 --- a/public/assets/javascripts/ui/editor/EditorView.js +++ b/public/assets/javascripts/ui/editor/EditorView.js @@ -21,6 +21,7 @@ var EditorView = View.extend({ this.textEditor = new TextEditor ({ parent: this }) this.collaborators = new Collaborators ({ parent: this }) this.presets = new Presets ({ parent: this }) + this.share = new ShareView ({ parent: this }) }, load: function(name){ @@ -41,6 +42,8 @@ var EditorView = View.extend({ ready: function(data){ $("#map").hide() + this.data = data + this.settings.load(data) this.info.load(data) }, @@ -70,6 +73,7 @@ var EditorView = View.extend({ hideExtras: function(){ this.mediaEditor.hide() this.textEditor.hide() + this.share.hide() Scenery.resize.hide() Scenery.hovering = false } |
