summaryrefslogtreecommitdiff
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
parent2f49a75e814521268df829feef5f71ee47209630 (diff)
reader adjustments
-rw-r--r--public/assets/javascripts/rectangles/models/floor.js2
-rw-r--r--public/assets/javascripts/ui/builder/BuilderInfo.js2
-rw-r--r--public/assets/javascripts/ui/reader/MediaPlayer.js2
-rwxr-xr-xpublic/assets/stylesheets/app.css11
4 files changed, 14 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 3f452e1..2fb870f 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -82,6 +82,8 @@
// TODO: watch individual scenery object here
Minotaur.watch( app.router.editorView.settings )
+
+ app.controller.pickWall(base, null)
}
else {
app.controller.pickWall(base, null)
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
}
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 9df1573..226fe98 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1930,8 +1930,8 @@ input[type="range"]::-webkit-slider-thumb {
}
.playButton,.muteButton {
- border-radius: 50px;
- font-size: 22px;
+ border-radius: 50%;
+ font-size: 23px;
padding: 5px 0;
cursor: pointer;
margin-right: 5px;
@@ -1942,6 +1942,8 @@ input[type="range"]::-webkit-slider-thumb {
}
.playButton .on {
display: inline;
+ position: relative;
+ left: 1px;
}
.playButton.paused .on {
display: none;
@@ -1956,6 +1958,8 @@ input[type="range"]::-webkit-slider-thumb {
.muteButton .on {
display: inline;
padding-right: 3px;
+ position: relative;
+ left: 2px;
}
.muteButton.muted .on {
display: none;
@@ -1966,6 +1970,9 @@ input[type="range"]::-webkit-slider-thumb {
.muteButton.muted .off {
display: inline;
padding-right: 3px;
+ position: relative;
+ left: 2px;
+ top: -1px;
}
.btn, button {