From e6cac4737904750a80173ba8e7745d2b41370bd6 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 6 Nov 2014 15:48:27 -0500
Subject: share vvbox comes up when clicking save

---
 public/assets/javascripts/ui/reader/ReaderView.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'public/assets/javascripts/ui/reader/ReaderView.js')

diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index c132609..9e0d21e 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -29,6 +29,7 @@ var ReaderView = View.extend({
 	ready: function(data){
 		$("#map").hide()
 
+    this.data = data
 		data.rooms && Rooms.deserialize(data.rooms)
 		data.walls && Walls.deserialize(data.walls)
 		data.media && Scenery.deserialize(data.media)
-- 
cgit v1.2.3-70-g09d2


From 1b2f4c77e5785073fd2b75380b521e1160070488 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 7 Nov 2014 15:31:29 -0500
Subject: non-interactive embed

---
 public/assets/javascripts/ui/reader/EmbedView.js  | 37 ++++++++++++++++++-----
 public/assets/javascripts/ui/reader/ReaderView.js | 36 +++++++++++++++++-----
 public/assets/javascripts/ui/reader/Tracker.js    |  4 +--
 views/controls/reader/about-room.ejs              |  2 +-
 views/controls/reader/embed.ejs                   |  3 +-
 5 files changed, 64 insertions(+), 18 deletions(-)

(limited to 'public/assets/javascripts/ui/reader/ReaderView.js')

diff --git a/public/assets/javascripts/ui/reader/EmbedView.js b/public/assets/javascripts/ui/reader/EmbedView.js
index a0b3c6f..21e351c 100644
--- a/public/assets/javascripts/ui/reader/EmbedView.js
+++ b/public/assets/javascripts/ui/reader/EmbedView.js
@@ -6,7 +6,9 @@ var EmbedView = ModalView.extend({
     "input [name=width]": "build",
     "input [name=height]": "build",
     "click [name=mute]": "build",
+    "click [name=interactive]": "build",
     "click textarea": "selectAll",
+    "click #test": "test",
   },
   
   defaultWidth: 600,
@@ -18,6 +20,7 @@ var EmbedView = ModalView.extend({
     this.$width = this.$("[name=width]")
     this.$height = this.$("[name=height]")
     this.$mute = this.$("[name=mute]")
+    this.$interactive = this.$("[name=interactive]")
     
     this.$width.val(this.defaultWidth)
     this.$height.val(this.defaultHeight)
@@ -29,18 +32,38 @@ var EmbedView = ModalView.extend({
 	},
 
   build: function(){
+    var kode = this.getEmbedCode()
+    this.$embedCode.val( kode )
+  },
+  
+  getEmbedCode: function(){
     var mute = this.$mute.prop('checked') ? 1 : 0
+    var interactive = this.$interactive.prop('checked') ? 1 : 0
     var width = clamp( this.$width.int(), 0, 2000) || this.defaultWidth
     var height = clamp( this.$height.int(), 0, 2000) || this.defaultHeight
     var link = this.parent.getLink()
-    link += "?mute=" + mute
-//    link += "&noui=1"
-    var kode = "<iframe src='" + encodeURI(link) + "' width='" + width + "' height='" + height + "'"
-             + " seamless scrolling='no' style='border: 0'"
-             + " webkitAllowFullScreen mozallowfullscreen allowfullscreen"
-             + "></iframe>"
+    var embed_link = link
+    embed_link += "?mute=" + mute
+    embed_link += "&embed=1"
+
+    var kode = "<iframe src='" + encodeURI(embed_link) + "' width='" + width + "' height='" + height + "'"
+    kode += " seamless scrolling='no' style='border: 0'"
+    kode += " webkitAllowFullScreen mozallowfullscreen allowfullscreen"
+    if (! interactive) {
+      kode += " style='pointer-events:none;'"
+    }
+    kode += "></iframe>"
     
-    this.$embedCode.val( kode )
+    if (! interactive) {
+      kode = "<div style='position:relative'>" + kode + "<a href='" + encodeURI(link) + "' style='display:block;position:absolute;top:0;left:0;width:" + width + "px;height:" + height + "px;'></a></div>"
+    }
+    
+    return kode
+  },
+  
+  test: function(){
+    var kode = this.getEmbedCode()
+    window.open("data:text/html," + kode, "_blank")
   },
   
   selectAll: function(){
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 9e0d21e..db2ab2f 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -13,17 +13,39 @@ var ReaderView = View.extend({
 	},
 
 	load: function(name){
-		if (window.location.search.indexOf("noui") !== -1) {
-			$(".logo,.topLinks,#editorView").hide()
+	  var opt = this.getQS()
+	  var mode = "default"
+		var name = sanitize(name)
+
+		if (opt.noui) {
+			$(".logo, .topLinks, #editorView, #keyhint").hide()
+      mode = "noui"
 		}
-		else {
-		  this.tracker = new Tracker ()
+		if (opt.embed) {
+			$(".topLinks, .share, #edit-room-link, #keyhint").hide()
+      mode = "embed"
 		}
-		if (window.location.search.indexOf("mute") !== -1) {
+		if (opt.mute) {
 			app.muted = true
 		}
-		name = sanitize(name)
-		$.get(this.projectAction + name, this.ready.bind(this))
+
+    this.tracker = new Tracker ({ mode: mode })
+
+    $.get(this.projectAction + name, this.ready.bind(this))
+	},
+	
+	getQS: function(){
+	  var qs = {}
+	  window.location.search.replace(/^\?/,"").split("&").forEach(function(s){
+	    var pair = s.split("=")
+	    if (pair.length < 2) {
+        qs[pair[0]] = true
+	    }
+	    else {
+        qs[pair[0]] = pair[1]
+	    }
+	  })
+	  return qs
 	},
 	
 	ready: function(data){
diff --git a/public/assets/javascripts/ui/reader/Tracker.js b/public/assets/javascripts/ui/reader/Tracker.js
index beef071..bad42a8 100644
--- a/public/assets/javascripts/ui/reader/Tracker.js
+++ b/public/assets/javascripts/ui/reader/Tracker.js
@@ -13,7 +13,7 @@ var Tracker = Fiber.extend(function(base){
 		  this.events = []
 		  
 		  this.bind()
-		  this.trackPageview()
+		  this.trackPageview(opt)
 		},
 		
 		bind: function () {
@@ -29,7 +29,7 @@ var Tracker = Fiber.extend(function(base){
 		},
 		
 		trackPageview: function(opt){
-      this.pushEvent([ "view" ])
+      this.pushEvent([ "view", opt.mode ])
 		},
 
     //
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index eba8c98..7e02e93 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -17,6 +17,6 @@
 	</div>
 
 	  [[ if (canEdit) { ]]
-	   <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a>
+	   <a href="[[- editlink ]]" class="btn warn marg" id="edit-room-link">Edit Room</a>
 	  [[ } ]]
 </div>
diff --git a/views/controls/reader/embed.ejs b/views/controls/reader/embed.ejs
index a897fbe..d8e3d4a 100644
--- a/views/controls/reader/embed.ejs
+++ b/views/controls/reader/embed.ejs
@@ -13,12 +13,13 @@
         
         dimensions: <input type="text" name="width">x<input type="text" name="height">
         <input type="checkbox" name="mute" id="mute" checked> <label for="mute">mute</label>
+        <input type="checkbox" name="interactive" id="interactive" checked> <label for="interactive">interactive</label>
 <!-- 
         <input type="checkbox" id=""> <label for=""></label>
         <input type="checkbox" id=""> <label for=""></label>
         <input type="checkbox" id=""> <label for=""></label>
  -->
-
+        <button id="test">test</button>
       </div>
     </div>
   </div>
-- 
cgit v1.2.3-70-g09d2


From 6613eafa8d5c3e323e464e56c523505928568844 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 7 Nov 2014 17:49:41 -0500
Subject: don’t put things in the dom until you’re in landscape mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/javascripts/ui/reader/ReaderView.js | 21 ++++++++++++++++++++-
 public/assets/javascripts/vendor/polyfill.js      |  8 +++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'public/assets/javascripts/ui/reader/ReaderView.js')

diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index db2ab2f..aea681a 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -50,8 +50,27 @@ var ReaderView = View.extend({
 	
 	ready: function(data){
 		$("#map").hide()
-
     this.data = data
+    var is_landscape = window.innerWidth > window.innerHeight
+
+		if (is_desktop || (is_mobile && is_landscape)) {
+		  this.build(data)
+		  return
+		}
+		
+		// don't build anything until we're in landscape mode, otherwise ios might crash
+		var orientationFn = orientationchange.bind(this)
+    window.addEventListener('orientationchange', orientationFn)
+    function orientationchange (e) {
+      var is_landscape = window.innerWidth > window.innerHeight
+      if (is_landscape) {
+        window.removeEventListener('orientationchange', orientationFn)
+        this.build(data)
+      }
+    }
+  },
+  
+  build: function(data){
 		data.rooms && Rooms.deserialize(data.rooms)
 		data.walls && Walls.deserialize(data.walls)
 		data.media && Scenery.deserialize(data.media)
diff --git a/public/assets/javascripts/vendor/polyfill.js b/public/assets/javascripts/vendor/polyfill.js
index 8e4b9dc..499cbc5 100644
--- a/public/assets/javascripts/vendor/polyfill.js
+++ b/public/assets/javascripts/vendor/polyfill.js
@@ -53,10 +53,12 @@ function has3d(){
 })( navigator.userAgent );
 
 // Naive useragent detection pattern
-var is_iphone = (navigator.userAgent.match(/iPhone/i)) || (navigator.userAgent.match(/iPod/i));
-var is_ipad = (navigator.userAgent.match(/iPad/i));
+var is_iphone = (navigator.userAgent.match(/iPhone/i)) || (navigator.userAgent.match(/iPod/i))
+var is_ipad = (navigator.userAgent.match(/iPad/i))
 var is_android = (navigator.userAgent.match(/Android/i))
-var is_mobile = is_iphone || is_ipad || is_android;
+var is_mobile = is_iphone || is_ipad || is_android
+var is_desktop = ! is_mobile;
+
 
 // rAF shim
 (function() {
-- 
cgit v1.2.3-70-g09d2