summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/models/wall.js
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-10-16 02:21:46 -0400
committerJulie Lala <jules@okfoc.us>2014-10-16 02:33:59 -0400
commitc13532ec95c2d410354f7d342df70fd68dd78272 (patch)
tree490509cee5ea68196c81c67fb8af5c6fea06e0d1 /public/assets/javascripts/rectangles/models/wall.js
parent513a272520222784d67dc22c1ac833aa47a9c844 (diff)
matrix mode
Diffstat (limited to 'public/assets/javascripts/rectangles/models/wall.js')
-rw-r--r--public/assets/javascripts/rectangles/models/wall.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 2ee88d9..542c99a 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -213,7 +213,7 @@
this.$walls.css("background-color", color)
}
- Wall.prototype.wallpaper = function(background){
+ Wall.prototype.wallpaper = function(background, img){
if (! background) {
background = { src: "none" }
}
@@ -235,7 +235,7 @@
return
}
- var img = new Image ()
+ img = img || new Image ()
img.onload = function(){
this.backgroundImage = img
this.wallpaperLoad(this.background.src)