summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/editor/EditorSettings.js
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/ui/editor/EditorSettings.js')
-rw-r--r--public/assets/javascripts/ui/editor/EditorSettings.js7
1 files changed, 1 insertions, 6 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 45a2e43..89040e1 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -32,8 +32,7 @@ var EditorSettings = FormView.extend({
this.action = data.isNew ? this.createAction : this.updateAction
this.parent.data = data
- data.rooms && Rooms.deserialize(data.rooms)
- data.walls && Walls.deserialize(data.walls)
+ data.rooms && Rooms.deserialize(data.rooms, data.walls)
data.startPosition && scene.camera.move(data.startPosition)
if (data.colors && data.colors.wall) {
@@ -66,10 +65,6 @@ var EditorSettings = FormView.extend({
data.media && Scenery.deserialize(data.media)
}
-
- app.on("rooms-built", function(){
- Walls.paint()
- })
},
showCollaborators: function(e){