merge

2 files changed, 6 insertions, 3 deletions

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")
 	}