From e35e2f338ee7b14d8396485e58cb5593060add8e Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 28 Aug 2014 17:55:31 -0400 Subject: persisting wall colors in db --- public/assets/javascripts/ui/editor/EditorSettings.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'public/assets/javascripts/ui/editor/EditorSettings.js') 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) ) ) -- cgit v1.2.3-70-g09d2