merge

1 files changed, 10 insertions, 0 deletions

diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index b2a5b12..7ff4ccb 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -45,6 +45,12 @@ window.Wall = (function(){
 				if (Scenery.nextMedia) {
 					Scenery.addNextToWall(base)
 				}
+				else if (Scenery.nextWallpaper) {
+					base.wallpaper()
+				}
+				else {
+					app.controller.hideExtras()
+				}
 			}
 		})
 	}
@@ -109,6 +115,10 @@ window.Wall = (function(){
 		this.$walls && this.$walls.css("background-color", color)
 	}
 	
+	Wall.prototype.wallpaper = function(){
+		this.$walls.css("background-image", Scenery.nextWallpaper)
+	}
+	
 	Wall.prototype.siblings = function(){
 		var base = this
 		var match = base.side | base.half_side