diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-20 17:03:30 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-20 17:03:30 -0400 |
| commit | 3b0962d1d07ed4aa74536e3323feed1a2dbc5643 (patch) | |
| tree | 5c43ebd561c7b80830ffc25d55ab9492d1f6c0bf /public/assets/javascripts/rectangles/models/floor.js | |
| parent | d5902489a6454119330549e4c13f153acd776ef2 (diff) | |
| parent | 6dadb217e8253138936d4f5180f9cefa6e7caed9 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/rectangles/models/floor.js')
| -rw-r--r-- | public/assets/javascripts/rectangles/models/floor.js | 5 |
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 |