summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/reader
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-08-27 18:17:14 -0400
committerJules Laplace <jules@okfoc.us>2015-08-27 18:32:32 -0400
commitee110d4725943bbc2b783323ec5087324531ca33 (patch)
tree5217c8116a2ac916f6143263337c9da46b8c6505 /public/assets/javascripts/ui/reader
parentebb9226fd5d37e8033e87e41b8ac0355d68f954c (diff)
get rooms api working with shapes
Diffstat (limited to 'public/assets/javascripts/ui/reader')
-rw-r--r--public/assets/javascripts/ui/reader/ReaderView.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 1ba97cf..43e81d8 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -76,7 +76,12 @@ var ReaderView = View.extend({
},
build: function(data){
- data.rooms && Rooms.deserialize(data.rooms)
+ if (data.shapes.length) {
+ Rooms.deserializeFromShapes(data)
+ }
+ else {
+ Rooms.deserialize(data.rooms)
+ }
data.walls && Walls.deserialize(data.walls)
data.media && Scenery.deserialize(data.media)
data.sculpture && Sculpture.deserialize(data.sculpture)