summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/ui')
-rw-r--r--public/assets/javascripts/ui/editor/MediaEditor.js2
-rw-r--r--public/assets/javascripts/ui/reader/MediaPlayer.js3
-rw-r--r--public/assets/javascripts/ui/reader/ReaderView.js6
3 files changed, 7 insertions, 4 deletions
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")
}