summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/reader
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-11-10 18:00:40 -0500
committerJules Laplace <jules@okfoc.us>2014-11-10 18:00:40 -0500
commitfc00dfa28faddff26778f2580d263526ca3b335e (patch)
treeefb0afa29069deda031825342227d2c3529ba666 /public/assets/javascripts/ui/reader
parent3269c126b76e076e8e91a8bbd5598beb42824c2d (diff)
show/hide minimap as appropriate
Diffstat (limited to 'public/assets/javascripts/ui/reader')
-rw-r--r--public/assets/javascripts/ui/reader/MediaPlayer.js3
-rw-r--r--public/assets/javascripts/ui/reader/ReaderView.js6
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")
}