From fc00dfa28faddff26778f2580d263526ca3b335e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 10 Nov 2014 18:00:40 -0500
Subject: show/hide minimap as appropriate

---
 public/assets/javascripts/mx/extensions/mx.movements.js             | 6 +++++-
 public/assets/javascripts/rectangles/engine/map/_map.js             | 1 +
 .../assets/javascripts/rectangles/engine/scenery/types/_object.js   | 1 -
 public/assets/javascripts/ui/editor/MediaEditor.js                  | 2 +-
 public/assets/javascripts/ui/reader/MediaPlayer.js                  | 3 ++-
 public/assets/javascripts/ui/reader/ReaderView.js                   | 6 ++++--
 6 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'public/assets/javascripts')

diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 82db40d..9af2c8d 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -33,7 +33,11 @@ MX.Movements = function (cam) {
 	
 	var pos = { x: 0, y: 0, z: 0, rotationX: 0, rotationY: 0 }
 
-  $(document).one("keydown", function(){ $("#keyhint").fadeOut(250); $('.reader #minimap').addClass('active'); })
+  $(document).one("keydown", function(){
+    $("#keyhint").fadeOut(250);
+    $('.reader #minimap').addClass('active');
+  })
+
 	function clampRotation( vr ) {
 		if (Rooms.mover.noclip) {
 			return clamp(vr, PI/-2, PI/2 )
diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index 64372c5..202803a 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -15,6 +15,7 @@ var Map = function(opt){
 	
 	var base = this
 	base.el = opt.el
+	base.$el = $(base.el)
 	
 	if (! base.el) return
 	
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
index c3fd6f3..51d1b88 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/_object.js
@@ -29,7 +29,6 @@ Scenery.types.base = Fiber.extend(function(base){
 		},
 		
 		place: function(opt){
-		  console.log(opt)
 			if (opt.data) {
         if (opt.wall) {
         	var position = opt.wall.mxToPosition(opt.data.position)
diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index db5878f..de93f6e 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -65,7 +65,7 @@ var MediaEditor = FormView.extend({
 		
 		var media = scenery.media
 		
-		console.log(media)
+		// console.log(media)
 		
 		this.$name.val(media.title || filenameFromUrl(media.url) )
 		this.$description.val(media.description)
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index e40c6ff..42e7596 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -46,7 +46,7 @@ var MediaPlayer = FormView.extend({
 		if (media.type == "image") {
 			if ( ! media.description && (! media.title || media.title == filenameFromUrl(media.url)) ) {
 				this.hide()
-				return
+				return false
 			}
 		}
 
@@ -78,6 +78,7 @@ var MediaPlayer = FormView.extend({
 
 				break
 		}
+		return true
 	},
 	
 	hide: function(scenery){
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index aea681a..617a145 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -58,7 +58,7 @@ var ReaderView = View.extend({
 		  return
 		}
 		
-		// don't build anything until we're in landscape mode, otherwise ios might crash
+		// 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) {
@@ -119,7 +119,8 @@ var ReaderView = View.extend({
 	},
 
 	pick: function(scenery){
-		this.mediaPlayer.pick(scenery)
+		var has_info = this.mediaPlayer.pick(scenery)
+    $("#minimap").toggleClass('active', ! has_info)
     app.tube("pick-scenery", { scenery: scenery })
 	},
 
@@ -128,6 +129,7 @@ var ReaderView = View.extend({
 	},
 
 	hideExtras: function(){
+		$("#minimap").addClass('active')
 		this.mediaPlayer.hide()
     app.tube("close-scenery")
 	}
-- 
cgit v1.2.3-70-g09d2