Skip to content

Commit fb7cad5

Browse files
estelleteoli2003
andauthored
Apply suggestions from code review
Co-authored-by: Jean-Yves Perrier <jypenator@gmail.com>
1 parent 3aed42a commit fb7cad5

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

modules/colors.html

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113

114114
function createColor() {
115115
const currentColor = colorPicker.value;
116-
const currentOpacity = opacityPicker.value * 1;
116+
const currentOpacity = Number(opacityPicker.value);
117117
setBackgroundColor(currentColor, currentOpacity);
118118
createHEX(currentColor, currentOpacity);
119119
createRGB(currentColor, currentOpacity);
@@ -146,27 +146,37 @@
146146

147147
function createHSL(r, g, b, opacity) {
148148
const cell = document.querySelector("#HSL td");
149-
(r = r / 255), (g = g / 255), (b = b / 255);
149+
// Let's have r, g, b in the range [0, 1]
150+
r = r / 255;
151+
g = g / 255;
152+
b = b / 255;
150153
const cmin = Math.min(r, g, b);
151154
const cmax = Math.max(r, g, b);
152155
const delta = cmax - cmin;
153156
let h = 0,
154157
s = 0,
155158
l = 0;
156159

157-
if (delta === 0) h = 0;
158-
else if (cmax === r) h = ((g - b) / delta) % 6;
159-
else if (cmax === g) h = (b - r) / delta + 2;
160+
if (delta === 0) {
161+
h = 0;
162+
} else if (cmax === r) {
163+
h = ((g - b) / delta) % 6;
164+
} else if (cmax === g) {
165+
h = (b - r) / delta + 2;
166+
}
160167
else h = (r - g) / delta + 4;
161168

162169
h = Math.round(h * 60);
163170

164-
if (h < 0) h += 360;
171+
// We want an angle between 0 and 360°
172+
if (h < 0) {
173+
h += 360;
174+
}
165175

166176
l = (cmax + cmin) / 2;
167177
s = (delta === 0) ? 0 : delta / (1 - Math.abs(2 * l - 1));
168-
s = +(s * 100).toFixed(1);
169-
l = +(l * 100).toFixed(1);
178+
s = Number((s * 100).toFixed(1));
179+
l = Number((l * 100).toFixed(1));
170180

171181
if (opacity === 1) {
172182
cell.textContent = `hsl(${h} ${s}% ${l}%)`;

0 commit comments

Comments
 (0)