summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-07-21 18:56:52 -0400
committerJules Laplace <jules@okfoc.us>2014-07-21 18:56:52 -0400
commit268966ed99185cc53b5ae6d9362298cde270d667 (patch)
tree9ce822bff283d78c5cfa582e319012b013531497
parentf34e91ebed4ec05a9c781311093b59aa90f9272d (diff)
stroke_colors (not working yet)
-rw-r--r--public/assets/javascripts/rectangles/models/wall.js25
-rw-r--r--public/assets/javascripts/ui/builder/BuilderInfo.js4
2 files changed, 23 insertions, 6 deletions
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 7ff4ccb..176bd7c 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -125,14 +125,35 @@ window.Wall = (function(){
var walls = Rooms.list[this.room].walls.filter(function(w){
return (w.side | w.half_side) & match
})
- return walls;
+ return walls
}
Wall.prototype.randomize_colors = function(){
var color = window.grayColors[ this.side | this.half_side ]
- this.siblings().forEach(function(w){ w.color(color) })
+ var siblings = this.siblings()
+ siblings.forEach(function(w, i){
+ if (! w.$walls) return
+ w.color(color)
+ })
}
+ Wall.prototype.stroke_colors = function(){
+ var color = "#fff"
+ var siblings = this.siblings()
+ siblings.forEach(function(w, i){
+ if (! w.$walls) return
+ w.color(color)
+ if (i == 0) {
+ w.$walls.css("border-left", "1px solid #000")
+ }
+ if (i == siblings.length-1) {
+ w.$walls.css("border-right", "1px solid #000")
+ }
+ w.$walls.css("border-top", "1px solid #000")
+ w.$walls.css("border-bottom", "1px solid #000")
+ })
+ }
+
return Wall
})()
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 2a7c8d9..56f1338 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -55,8 +55,6 @@ var BuilderInfo = View.extend({
this.$height.unitVal( room.height )
this.$x.unitVal( room.rect.x.a )
this.$y.unitVal( room.rect.y.a )
-
- console.log(room)
},
destroy: function(room){
@@ -89,12 +87,10 @@ var BuilderInfo = View.extend({
this.room.rect.y.setPosition( this.$y.unitVal() )
Rooms.clipper.update()
},
-
changeUnits: function(){
app.units = this.$units.val()
this.$('.units').resetUnitVal()
},
-
changeViewHeight: function(){
window.viewHeight = this.$viewHeight.unitVal( )
},