Bug fix: handleSlider() always used default color even in rainbow mode

astroud · astroud · commit 93b51c52ef9d · 2020-07-01T14:04:54.000-07:00
diff --git a/33 - Etch-a-Sketch/etch-a-sketch.js b/33 - Etch-a-Sketch/etch-a-sketch.js
@@ -87,16 +87,16 @@ function vigorousStroke() {
 }
 
 function handleSlider() {
-  console.log(`slider.value ${slider.value}  and ctx.lineWidth ${ctx.lineWidth}`);
+  let tmpStrokeColor = ctx.strokeStyle;
+
   if (slider.value < ctx.lineWidth) {
     ctx.strokeStyle = `rgb(${CANVAS_BACKGROUND})`;
     vigorousStroke();
     ctx.lineWidth = slider.value;
-    ctx.strokeStyle = DEFAULT_STROKE_COLOR;
+    ctx.strokeStyle = tmpStrokeColor;
     ctx.stroke();
   }
   else {
-    ctx.strokeStyle = DEFAULT_STROKE_COLOR;
     ctx.lineWidth = slider.value;
     ctx.stroke();
   }

Original file line number	Diff line number	Diff line change
`@@ -87,16 +87,16 @@ function vigorousStroke() {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`function handleSlider() {`
`90`		- console.log(`slider.value ${slider.value} and ctx.lineWidth ${ctx.lineWidth}`);
	`90`	`+ let tmpStrokeColor = ctx.strokeStyle;`
	`91`	`+`
`91`	`92`	`if (slider.value < ctx.lineWidth) {`
`92`	`93`	ctx.strokeStyle = `rgb(${CANVAS_BACKGROUND})`;
`93`	`94`	`vigorousStroke();`
`94`	`95`	`ctx.lineWidth = slider.value;`
`95`		`- ctx.strokeStyle = DEFAULT_STROKE_COLOR;`
	`96`	`+ ctx.strokeStyle = tmpStrokeColor;`
`96`	`97`	`ctx.stroke();`
`97`	`98`	`}`
`98`	`99`	`else {`
`99`		`- ctx.strokeStyle = DEFAULT_STROKE_COLOR;`
`100`	`100`	`ctx.lineWidth = slider.value;`
`101`	`101`	`ctx.stroke();`
`102`	`102`	`}`