diff options
| author | ryderr <r@okfoc.us> | 2014-10-20 17:03:57 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-20 17:03:57 -0400 |
| commit | 392bdf16047617bf4a3b99fa2dd7792134b9e3e0 (patch) | |
| tree | 645fd88733abd469383a4f505d25e59b609dc249 /public/assets/javascripts/rectangles/models/wall.js | |
| parent | 2300f22955c0ee8250195e7f4cb70ac675570d7f (diff) | |
| parent | 6dadb217e8253138936d4f5180f9cefa6e7caed9 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/rectangles/models/wall.js')
| -rw-r--r-- | public/assets/javascripts/rectangles/models/wall.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js index 75814dc..8590de7 100644 --- a/public/assets/javascripts/rectangles/models/wall.js +++ b/public/assets/javascripts/rectangles/models/wall.js @@ -288,10 +288,11 @@ Wall.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 var w = Math.round( this.backgroundImage.naturalWidth * this.background.scale ) var h = Math.round( this.backgroundImage.naturalHeight * this.background.scale ) |