persisting wall colors in db

2 files changed, 12 insertions, 11 deletions

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 2d3201e..2a3929a 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -35,8 +35,8 @@ var EditorSettings = FormView.extend({
 		data.walls && Walls.deserialize(data.walls)
 		data.startPosition && scene.camera.move(data.startPosition)
 
-    if (data.colors) {
-      this.parent.lightControl.load()
+    if (data.colors && data.colors.wall) {
+      this.parent.lightControl.load(data.colors)
     }
     else {
 		  this.parent.lightControl.loadDefaults()
@@ -136,7 +136,8 @@ var EditorSettings = FormView.extend({
 		fd.append( "description", this.$description.val() )
 		fd.append( "privacy", this.$privacy.filter(":checked").val() == "private" )
 		fd.append( "rooms", JSON.stringify( Rooms.serialize() ) )
- 		fd.append( "walls", JSON.stringify( Rooms.serializeWalls() ) )
+ 		fd.append( "walls", JSON.stringify( Walls.serialize() ) )
+ 		fd.append( "colors", JSON.stringify( Walls.colors ) )
 		fd.append( "media", JSON.stringify( Scenery.serialize() ) )
 		fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) )
 		
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index 5133de2..84f2e58 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -29,19 +29,19 @@ var LightControl = View.extend({
 	},
 
   load: function(data){
-		this.setWallColor(data.wallColor, false)
-		this.setOutlineColor(data.outlineColor)
-		this.setFloorColor(data.floorColor)
-		this.setCeilingColor(data.ceilingColor)
+		this.setWallColor(data.wall, false)
+		this.setOutlineColor(data.outline)
+		this.setFloorColor(data.floor)
+		this.setCeilingColor(data.ceiling)
 		this.setMode("wall")
   },
   
   loadDefaults: function(){
     var colors = {
-      wallColor: app.defaults.wallColor.slice(),
-      outlineColor: app.defaults.outlineColor.slice(),
-      floorColor: app.defaults.floorColor.slice(),
-      ceilingColor: app.defaults.ceilingColor.slice(),
+      wall: app.defaults.wallColor.slice(),
+      outline: app.defaults.outlineColor.slice(),
+      floor: app.defaults.floorColor.slice(),
+      ceiling: app.defaults.ceilingColor.slice(),
     }
     this.load(colors)
   },