merge

1 files changed, 7 insertions, 0 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index f60b149..6aff601 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -11,6 +11,7 @@ var EditorView = View.extend({
 	initialize: function(){
 		this.toolbar = new EditorToolbar ({ parent: this })
 		this.settings = new EditorSettings ({ parent: this })
+		this.info = new BuilderInfo ({ parent: this })
 		this.mediaViewer = new MediaViewer ({ parent: this })
 		this.mediaUpload = new MediaUpload ({ parent: this })
 		this.mediaEditor = new MediaEditor ({ parent: this })
@@ -18,6 +19,7 @@ var EditorView = View.extend({
 		this.lightControl = new LightControl ({ parent: this })
 		this.textEditor = new TextEditor ({ parent: this })
 		this.collaborators = new Collaborators ({ parent: this })
+		this.presets = new Presets ({ parent: this })
 	},
 
 	load: function(name){
@@ -26,6 +28,11 @@ var EditorView = View.extend({
 	},
 	
 	loadLayout: function(layout){
+	  if (layout == "empty") {
+	    this.readyLayout({})
+	    this.toolbar.toggleMap()
+      return
+	  }
 		layout = sanitize(layout)
 		$.get(this.layoutAction + layout, this.readyLayout.bind(this))
 	},