diff options
| author | Jules Laplace <jules@okfoc.us> | 2016-01-25 14:32:14 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2016-01-25 14:32:14 -0500 |
| commit | 343b0b3dc5bb7dbe762182a486e63a4aff6ef8fc (patch) | |
| tree | da700685b48bcdedb4703fb27aab4741949893c9 | |
| parent | 156568f6c334b2754afbffeb13f7f583dff42953 (diff) | |
| parent | 8eb31dca0084b70eb31ae93e235164e45b0cb7a6 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls into production
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/rooms/_walls.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/rectangles/models/floor.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/rectangles/models/wall.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js index 04d0594..38dac84 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js +++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js @@ -162,7 +162,7 @@ wall.wallpaper(background, img) }) }.bind(this) - img.src = background.src.replace("url(","").replace(")","") + img.src = background.src.replace(/url\(\"?\'?/,"").replace(/\"?\'?\)/,"") img.complete && img.onload() }, floor: function(background){ diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js index ac1f8c9..51537f3 100644 --- a/public/assets/javascripts/rectangles/models/floor.js +++ b/public/assets/javascripts/rectangles/models/floor.js @@ -118,7 +118,7 @@ background.scale = background.scale || 1 this.background = background - this.background.src = this.background.src.replace("url(","").replace(")","") + this.background.src = this.background.src.replace(/url\(\"?\'?/,"").replace(/\"?\'?\)/,"") if (this.background.src == "none") { this.wallpaperLoad(this.background.src) diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js index a026c3c..fc1ccbe 100644 --- a/public/assets/javascripts/rectangles/models/wall.js +++ b/public/assets/javascripts/rectangles/models/wall.js @@ -288,7 +288,7 @@ background.scale = background.scale || 1 this.background = background - this.background.src = this.background.src.replace("url(","").replace(")","") + this.background.src = this.background.src.replace(/url\(\"?\'?/,"").replace(/\"?\'?\)/,"") if (this.background.src == "none") { this.wallpaperLoad(this.background.src) |