Merge branch 'master' of github.com:okfocus/vvalls

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()