summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/EditorView.js
diff options
context:
space:
mode:
authorryderr <r@okfoc.us>2014-11-07 14:59:26 -0500
committerryderr <r@okfoc.us>2014-11-07 14:59:26 -0500
commitceba142b59a583fd5adbf6b368264a5fda4637f8 (patch)
treecca2811c60dadeea7852f5be51a67dd871208cec /public/assets/javascripts/ui/editor/EditorView.js
parent518e4f9b69b1f3bd82ead7bde3b51e3d17e80660 (diff)
parent5a35d057453f82aad1097f1a90e9bdd341018a17 (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.js4
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
}