Saturation is only undefined for black and white.

chjkw · Apr 30, 2013 · 0c7d186 · 0c7d186
1 parent 1d0409e
commit 0c7d186
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/d3.js b/d3.js
@@ -1442,11 +1442,14 @@ d3 = function() {
     return rgb(r, g, b);
   }
   function d3_rgb_hsl(r, g, b) {
-    var min = Math.min(r /= 255, g /= 255, b /= 255), max = Math.max(r, g, b), d = max - min, h = NaN, s = h, l = (max + min) / 2;
+    var min = Math.min(r /= 255, g /= 255, b /= 255), max = Math.max(r, g, b), d = max - min, h, s, l = (max + min) / 2;
     if (d) {
       s = l < .5 ? d / (max + min) : d / (2 - max - min);
       if (r == max) h = (g - b) / d + (g < b ? 6 : 0); else if (g == max) h = (b - r) / d + 2; else h = (r - g) / d + 4;
       h *= 60;
+    } else {
+      h = NaN;
+      s = l > 0 && l < 1 ? 0 : h;
     }
     return d3_hsl(h, s, l);
   }

diff --git a/d3.min.js b/d3.min.js
diff --git a/src/color/rgb.js b/src/color/rgb.js
@@ -117,15 +117,18 @@ function d3_rgb_hsl(r, g, b) {
   var min = Math.min(r /= 255, g /= 255, b /= 255),
       max = Math.max(r, g, b),
       d = max - min,
-      h = NaN,
-      s = h,
+      h,
+      s,
       l = (max + min) / 2;
   if (d) {
     s = l < .5 ? d / (max + min) : d / (2 - max - min);
     if (r == max) h = (g - b) / d + (g < b ? 6 : 0);
     else if (g == max) h = (b - r) / d + 2;
     else h = (r - g) / d + 4;
     h *= 60;
+  } else {
+    h = NaN;
+    s = l > 0 && l < 1 ? 0 : h;
   }
   return d3_hsl(h, s, l);
 }

diff --git a/test/color/hsl-test.js b/test/color/hsl-test.js
@@ -95,6 +95,10 @@ suite.addBatch({
       assert.strictEqual(hsl(0, .42, 1).s, .42);
       assert.strictEqual(hsl(0, 1, 1).s, 1);
     },
+    "s is zero for grayscale colors (but not white and black)": function(hsl) {
+      assert.strictEqual(hsl("#ccc").s, 0);
+      assert.strictEqual(hsl("#777").s, 0);
+    },
     "s is undefined when not explicitly specified for white or black": function(hsl) {
       assert.isNaN(hsl("#000").s);
       assert.isNaN(hsl("black").s);