diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-20 15:11:30 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-20 15:11:30 -0400 |
| commit | e2de422ece0c98c2dbea41e7156455dcf91b9db4 (patch) | |
| tree | b0fa595ea73bda1a6adf5bc1b9e3ccb279235c66 | |
| parent | 7fac90101bb5803ba593b0e11950009aa2115045 (diff) | |
fix preset bug
| -rw-r--r-- | public/assets/javascripts/ui/editor/Presets.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/public/assets/javascripts/ui/editor/Presets.js b/public/assets/javascripts/ui/editor/Presets.js index ab311ef..d233144 100644 --- a/public/assets/javascripts/ui/editor/Presets.js +++ b/public/assets/javascripts/ui/editor/Presets.js @@ -82,14 +82,17 @@ var Presets = View.extend({ lastPreset: {wall:[1],outline:[1],floor:[1],ceiling:[1]}, load: function(preset){ this.parent.colorControl.modes.forEach(function(mode){ + var color if (! preset[mode].length) { Walls.setWallpaper[mode](preset[mode]) + color = preset[mode].color } else { Walls.clearWallpaper[mode]() - } - Walls.setColor[mode](preset[mode]) - this.parent.colorControl.$swatch[ mode ].css("background-color", rgb_string(preset[mode])) + color = preset[mode] + } + Walls.setColor[mode](color) + this.parent.colorControl.$swatch[ mode ].css("background-color", rgb_string(color)) }.bind(this)) this.parent.colorControl.setMode(preset.wall.color ? "wall" : "floor") Walls.setBodyColor() |
