4 files changed, 52 insertions, 10 deletions
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index 8424d9c..8e65976 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -1,5 +1,5 @@
 
-var MediaPlayer = FormView.extend({
+var MediaPlayer = View.extend({
 	el: "#mediaPlayer",
 		
 	events: {
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 617a145..43e81d8 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -31,7 +31,12 @@ var ReaderView = View.extend({
 
     this.tracker = new Tracker ({ mode: mode })
 
-    $.get(this.projectAction + name, this.ready.bind(this))
+    if ('vvalls_data' in window) {
+      this.ready(window.vvalls_data)
+    }
+    else {
+      $.get(this.projectAction + name, this.ready.bind(this))
+    }
 	},
 	
 	getQS: function(){
@@ -71,9 +76,15 @@ 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)
 		data.startPosition && scene.camera.move(data.startPosition)
 		
 		cam.y = window.viewHeight = data.viewHeight || app.defaults.viewHeight
@@ -84,9 +95,12 @@ var ReaderView = View.extend({
       Walls.setColor[mode](colors[mode])
     })
 
-		editor.permissions.clear()
+		window.editor && editor.permissions.clear()
 		
-		this.listen()
+		// disable until we start using spinning again
+		// this.listen()
+
+    app.tube("site-ready")
 	},
 	
 	listen: function(){
diff --git a/public/assets/javascripts/ui/reader/Tracker.js b/public/assets/javascripts/ui/reader/Tracker.js
index ce32c59..d2dec39 100644
--- a/public/assets/javascripts/ui/reader/Tracker.js
+++ b/public/assets/javascripts/ui/reader/Tracker.js
@@ -1,8 +1,12 @@
-(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
+if (window.location.host.indexOf("lvh.me") === -1) {
+	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+	})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+}
+else {
+	ga = function(){}
+}
 ga('create', 'UA-56883705-1', 'auto');
 ga('send', 'pageview');
 
diff --git a/public/assets/javascripts/ui/reader/_router.js b/public/assets/javascripts/ui/reader/_router.js
new file mode 100644
index 0000000..f3b121b
--- /dev/null
+++ b/public/assets/javascripts/ui/reader/_router.js
@@ -0,0 +1,24 @@
+
+var SiteRouter = Router.extend({
+	el: "body",
+	
+	initialize: function(){
+		app.launch()
+		if (app.unsupported) return
+
+		this.readerView = app.controller = new ReaderView()
+		this.readerView.load()	
+			
+		$("body").removeClass("loading")
+	}
+
+})
+
+var editor = {
+  permissions: new Permissions({
+	  'pick': true,
+		'move': true,
+		'resize': true,
+		'destroy': false,
+	})
+}