diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-17 11:51:25 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-17 11:51:25 -0400 |
| commit | 7db5e48b24a3d2d0d70ab9d12838ce00606a94cf (patch) | |
| tree | 03b78e24b6589e0dc53c20695629ad3f81e388d6 | |
| parent | b4bbb94788fd27981ec36e6d248bae2f1229cab2 (diff) | |
| parent | 9661f1ae85ca9df7e35b09b8f982c155c0b21208 (diff) | |
merge
| -rw-r--r-- | public/assets/javascripts/rectangles/models/wall.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/builder/BuilderView.js | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js index cead2e4..75814dc 100644 --- a/public/assets/javascripts/rectangles/models/wall.js +++ b/public/assets/javascripts/rectangles/models/wall.js @@ -282,7 +282,7 @@ url = "url(" + url + ")" } this.mx.forEach(function(mx){ - mx.el.style.backgroundImage = url + if (mx.el) mx.el.style.backgroundImage = url }) } diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js index 735274e..9b7e1a2 100644 --- a/public/assets/javascripts/ui/builder/BuilderView.js +++ b/public/assets/javascripts/ui/builder/BuilderView.js @@ -31,6 +31,9 @@ var BuilderView = View.extend({ }, hideExtras: function(){ - } + }, + + pickWall: function(wall, pos){ + }, }) |