diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-17 13:38:04 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-17 13:38:04 -0400 |
| commit | 4a46dcbcb4555e0fa03c6b926787d521b54ac0d0 (patch) | |
| tree | bdb20f6ba46bf70da19f2ec7d38398c483727412 /public/assets/javascripts/ui/editor | |
| parent | a3535fefc311d1cbfcdbbd5c844a0979dcf7cfed (diff) | |
| parent | d9a6199f75d324c7b644beb1c732680a67ab8047 (diff) | |
merge
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() |