diff options
| author | ryderr <r@okfoc.us> | 2014-10-20 12:55:42 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-20 12:55:42 -0400 |
| commit | 2300f22955c0ee8250195e7f4cb70ac675570d7f (patch) | |
| tree | f2b40f33e4ba6ad65f08d35c0396d166afa1d3ec /public/assets/javascripts/ui/editor | |
| parent | c99a5651e30838db43ee6f1b24a9fdc71d7affff (diff) | |
| parent | 7fac90101bb5803ba593b0e11950009aa2115045 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/ui/editor')
| -rw-r--r-- | public/assets/javascripts/ui/editor/Presets.js | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js index be86af3..ab311ef 100644 --- a/public/assets/javascripts/ui/editor/Presets.js +++ b/public/assets/javascripts/ui/editor/Presets.js @@ -84,15 +84,12 @@ var Presets = View.extend({ this.parent.colorControl.modes.forEach(function(mode){ if (! preset[mode].length) { Walls.setWallpaper[mode](preset[mode]) - Walls.setColor[mode](preset[mode].color) } else { - if (preset[mode].length) { - Walls.clearWallpaper[mode]() - } - Walls.setColor[mode](preset[mode]) - this.parent.colorControl.$swatch[ mode ].css("background-color", rgb_string(preset[mode])) - } + Walls.clearWallpaper[mode]() + } + Walls.setColor[mode](preset[mode]) + this.parent.colorControl.$swatch[ mode ].css("background-color", rgb_string(preset[mode])) }.bind(this)) this.parent.colorControl.setMode(preset.wall.color ? "wall" : "floor") Walls.setBodyColor() |