From e4f1a5ad289a4c40adeb4e3f7c24aee078e3fe9e Mon Sep 17 00:00:00 2001
From: DD <liudi08@gmail.com>
Date: Tue, 3 Oct 2017 15:17:27 -0400
Subject: [PATCH] clean up and add comment

---
 src/containers/blob/blob.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/containers/blob/blob.js b/src/containers/blob/blob.js
index 62b126d8..6a9b871e 100644
--- a/src/containers/blob/blob.js
+++ b/src/containers/blob/blob.js
@@ -50,9 +50,12 @@ class Blobbiness {
      * @param {?number} options.strokeWidth Width of the brush outline.
      */
     setOptions (options) {
-        const oldFillColor = this.options ? this.options.fillColor : null;
+        const oldFillColor = this.options ? this.options.fillColor : 'black';
         const oldStrokeColor = this.options ? this.options.strokeColor : null;
         const oldStrokeWidth = this.options ? this.options.strokeWidth : null;
+        // If values are mixed, it means the color was set by a selection contained multiple values.
+        // In this case keep drawing with the previous values if any. (For stroke width, null indicates)
+        // mixed, because stroke width is required to be a number)
         this.options = {
             ...options,
             fillColor: options.fillColor === MIXED ? oldFillColor : options.fillColor,
@@ -163,8 +166,8 @@ class Blobbiness {
 
         if (this.cursorPreview &&
                 this.brushSize === this.options.brushSize &&
-                (this.options.fillColor === MIXED || this.fillColor === this.options.fillColor) &&
-                (this.options.strokeColor === MIXED || this.strokeColor === this.options.strokeColor)) {
+                this.fillColor === this.options.fillColor &&
+                this.strokeColor === this.options.strokeColor) {
             return;
         }
         const newPreview = new paper.Path.Circle({
@@ -175,12 +178,8 @@ class Blobbiness {
             this.cursorPreview.remove();
         }
         this.brushSize = this.options.brushSize;
-        if (this.options.fillColor !== MIXED) {
-            this.fillColor = this.options.fillColor;
-        }
-        if (this.options.strokeColor !== MIXED) {
-            this.strokeColor = this.options.strokeColor;
-        }
+        this.fillColor = this.options.fillColor;
+        this.strokeColor = this.options.strokeColor;
         this.cursorPreview = newPreview;
         styleCursorPreview(this.cursorPreview, this.options);
     }