summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-10-23 11:41:47 -0400
committerJules Laplace <jules@okfoc.us>2014-10-23 11:41:47 -0400
commitcf72035b219f6bc0b913f82223860cc79f95f82b (patch)
tree2aec8f33e0dbc3d9829767f03711900e6607cf8f /public/assets/javascripts/ui
parentd1126fbbc4aca209f708f2953b5bacb717ebc156 (diff)
parent8ee5078b472cf6be20dc6d9105cc687f205fd698 (diff)
merge
Diffstat (limited to 'public/assets/javascripts/ui')
-rw-r--r--public/assets/javascripts/ui/reader/ReaderView.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js
index 5f2db0f..8531244 100644
--- a/public/assets/javascripts/ui/reader/ReaderView.js
+++ b/public/assets/javascripts/ui/reader/ReaderView.js
@@ -33,6 +33,8 @@ var ReaderView = View.extend({
data.media && Scenery.deserialize(data.media)
data.startPosition && scene.camera.move(data.startPosition)
+ cam.y = window.viewHeight = data.viewHeight || app.defaults.viewHeight
+
var colors = data.colors || app.defaults.colors
var modes = [ "wall", "outline", "floor", "ceiling" ]
modes.forEach(function(mode){