summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/models/floor.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-10-20 16:42:08 -0400
committerJules Laplace <jules@okfoc.us>2014-10-20 16:42:08 -0400
commitb21cb665e3ca296b56d389d3a2f83434f4646f26 (patch)
tree28702570de220b1a8a7b715607ffe9be86de330e /public/assets/javascripts/rectangles/models/floor.js
parente2de422ece0c98c2dbea41e7156455dcf91b9db4 (diff)
logarithmic wallpaper scale
Diffstat (limited to 'public/assets/javascripts/rectangles/models/floor.js')
-rw-r--r--public/assets/javascripts/rectangles/models/floor.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 2fb870f..ac1f8c9 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -146,8 +146,9 @@
Floor.prototype.wallpaperPosition = function(background){
if (this.background.src == "none") { return }
- this.background.x = background.x || this.background.x
- this.background.y = background.y || this.background.y
+
+ this.background.x = background.x || this.background.x || 0
+ this.background.y = background.y || this.background.y || 0
this.background.scale = background.scale || this.background.scale || 1
var mx, dx, dy