summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-10-18 09:34:46 -0400
committerJules Laplace <jules@okfoc.us>2014-10-18 09:34:46 -0400
commita6d479579964014077502db5bc6e3af59c1f317e (patch)
tree9efb5ff58fc9120c787d965ca37282277791a88c /public/assets/javascripts/ui
parent2f49a75e814521268df829feef5f71ee47209630 (diff)
reader adjustments
Diffstat (limited to 'public/assets/javascripts/ui')
-rw-r--r--public/assets/javascripts/ui/builder/BuilderInfo.js2
-rw-r--r--public/assets/javascripts/ui/reader/MediaPlayer.js2
2 files changed, 3 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 4408511..4fd145d 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -96,6 +96,7 @@ var BuilderInfo = View.extend({
this.room.rect.x.setLength( this.$width.unitVal() )
Rooms.rebuild()
},
+
enterDepth: function(e){
if (e.keyCode == 13) this.changeDepth(e)
},
@@ -104,6 +105,7 @@ var BuilderInfo = View.extend({
this.room.rect.y.setLength( this.$depth.unitVal() )
Rooms.rebuild()
},
+
enterHeight: function(e){
if (e.keyCode == 13) this.changeHeight(e)
},
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index 6195ab6..7f73e1b 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -44,7 +44,7 @@ var MediaPlayer = FormView.extend({
this.unbind()
}
if (media.type == "image") {
- if ((! media.title || ! media.title.length) && (! media.description || ! media.description.length)) {
+ if ((! media.title || ! media.title.length) && (! media.description || ! media.description.length) || (media.title == filenameFromUrl(media.url)) ) {
this.hide()
return
}