From 3d8490dacba1b3020b9e1dd926ce99edfee48375 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 4 Nov 2014 15:44:45 -0500
Subject: toggle map link in settings

---
 public/assets/javascripts/ui/editor/EditorSettings.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'public/assets/javascripts/ui')

diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index de60b53..2b29961 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -17,6 +17,7 @@ var EditorSettings = FormView.extend({
 		"click [data-role='clone-project']": 'clone',
 		"click [data-role='clear-project']": 'clear',
 		"click [data-role='destroy-project']": 'destroy',
+		"click [data-role='toggle-map']": 'toggleMap',
     "click #startText": "setStartPosition",
     "click #moveText": "confirmStartPosition",
     "click #confirmText": "setStartPosition",
@@ -83,6 +84,11 @@ var EditorSettings = FormView.extend({
 	  this.parent.collaborators.show()
 	},
 	
+	toggleMap: function(e){
+	  e.preventDefault()
+	  app.controller.toolbar.toggleMap()
+	},
+	
 	clone: function(e){
 		e.preventDefault()
 
-- 
cgit v1.2.3-70-g09d2


From f4da7634e36cfca43e5bda916bfe1ce7b76950b8 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 4 Nov 2014 16:53:31 -0500
Subject: mobile view links should NOT take you to the editing view

---
 public/assets/javascripts/ui/_router.js | 9 +++++----
 views/reader.ejs                        | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'public/assets/javascripts/ui')

diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js
index d5a8e7f..7337357 100644
--- a/public/assets/javascripts/ui/_router.js
+++ b/public/assets/javascripts/ui/_router.js
@@ -73,12 +73,13 @@ var SiteRouter = Router.extend({
 		
 		this.route()
 		
-		/*
 		if (is_mobile) {
-			$(".topLinks").hide()
-			$(".share").hide()
+      // $(".topLinks").hide()
+      // $(".share").hide()
+      $('.projectItem').each(function(){
+        this.href = this.href.replace(/\/edit$/, "")
+      })
 		}
-		*/
 		
 		$("body").removeClass("loading")
 	},
diff --git a/views/reader.ejs b/views/reader.ejs
index b110ffd..e86bab1 100644
--- a/views/reader.ejs
+++ b/views/reader.ejs
@@ -16,6 +16,12 @@
 			[[ include controls/reader/about-room ]]
 			[[ include controls/reader/media-player ]]
 		</div>
+
+<!-- 
+		<div id="minimap" class="vvbox" data-intro="Mini-map shows your position and orientation in a room. Navigate with WASD keys or drag here." data-position="top">
+			<span class="el"></span>
+		</div>
+ -->
 	</div>
 	[[ } ]]
 
-- 
cgit v1.2.3-70-g09d2