summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/EditorSettings.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-08-28 17:22:28 -0400
committerJules Laplace <jules@okfoc.us>2014-08-28 17:22:28 -0400
commite200f73bdc55e4b6e3dcdf17f5fb5bfd6c020c2a (patch)
tree02a2435485c07824f552b99177ac0a4d42bb4203 /public/assets/javascripts/ui/editor/EditorSettings.js
parenta25d72ef6c31a75c1852dd9acf9dbb5b8b2c5a00 (diff)
split out walls stuff, remove dead code
Diffstat (limited to 'public/assets/javascripts/ui/editor/EditorSettings.js')
-rw-r--r--public/assets/javascripts/ui/editor/EditorSettings.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index e5dd844..2d3201e 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -32,8 +32,16 @@ var EditorSettings = FormView.extend({
this.parent.data = data
data.rooms && Rooms.deserialize(data.rooms)
+ data.walls && Walls.deserialize(data.walls)
data.startPosition && scene.camera.move(data.startPosition)
-
+
+ if (data.colors) {
+ this.parent.lightControl.load()
+ }
+ else {
+ this.parent.lightControl.loadDefaults()
+ }
+
if (data.isNew) {
this.$name.val( "Room " + moment().format("DD/MM/YYYY ha") )
}