merge

1 files changed, 13 insertions, 5 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index b87ac83..4067c4d 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -2,8 +2,8 @@
 var EditorView = View.extend({
 	el: "#editorView",
 	
-	projectAction: "/api/projects/",
-	layoutAction: "/api/layouts/",
+	projectAction: "/api/project/",
+	layoutAction: "/api/layout/",
 
 	events: {
 	},
@@ -13,18 +13,19 @@ var EditorView = View.extend({
 		this.settings = new EditorSettings ({ parent: this })
 		this.mediaViewer = new MediaViewer ({ parent: this })
 		this.mediaUpload = new MediaUpload ({ parent: this })
+		this.mediaEditor = new MediaEditor ({ parent: this })
 		this.wallpaperPicker = new WallpaperPicker ({ parent: this })
 		this.lightControl = new LightControl ({ parent: this })
 	},
 
 	load: function(name){
 		name = sanitize(name)
-		$.get(this.projectAction + name, $.proxy(this.ready, this))
+		$.get(this.projectAction + name, this.ready.bind(this))
 	},
 	
 	loadLayout: function(layout){
 		layout = sanitize(layout)
-		$.get(this.layoutAction + layout, $.proxy(this.readyLayout, this))
+		$.get(this.layoutAction + layout, this.readyLayout.bind(this))
 	},
 	
 	ready: function(data){
@@ -36,7 +37,14 @@ var EditorView = View.extend({
 	readyLayout: function(data){
 		data.isNew = true
 		this.ready(data)
+	},
+	
+	pick: function(scenery){
+		this.mediaEditor.pick(scenery)
+	},
+	
+	hideExtras: function(){
+		this.mediaEditor.hide()
 	}
 
 })
-