100% is 255, not 254.99999999999997.

d3 · Oct 18, 2015 · 710e5a7 · 710e5a7
1 parent a01276b
commit 710e5a7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d3-color",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Color spaces! RGB, HSL, Cubehelix, Lab and HCL (Lch).",
   "keywords": [
     "d3",

diff --git a/src/color.js b/src/color.js
@@ -24,8 +24,8 @@ export default function color(format) {
   return (m = reHex3.exec(format)) ? (m = parseInt(m[1], 16), rgb((m >> 8 & 0xf) | (m >> 4 & 0x0f0), (m >> 4 & 0xf) | (m & 0xf0), ((m & 0xf) << 4) | (m & 0xf))) // #f00
       : (m = reHex6.exec(format)) ? rgbn(parseInt(m[1], 16)) // #ff0000
       : (m = reRgbInteger.exec(format)) ? rgb(m[1], m[2], m[3]) // rgb(255,0,0)
-      : (m = reRgbPercent.exec(format)) ? rgb(m[1] * 2.55, m[2] * 2.55, m[3] * 2.55) // rgb(100%,0%,0%)
-      : (m = reHslPercent.exec(format)) ? hsl(m[1], m[2] * .01, m[3] * .01) // hsl(120,50%,50%)
+      : (m = reRgbPercent.exec(format)) ? rgb(m[1] * 255 / 100, m[2] * 255 / 100, m[3] * 255 / 100) // rgb(100%,0%,0%)
+      : (m = reHslPercent.exec(format)) ? hsl(m[1], m[2] / 100, m[3] / 100) // hsl(120,50%,50%)
       : named.hasOwnProperty(format) ? rgbn(named[format])
       : null;
 };

diff --git a/test/color-test.js b/test/color-test.js
@@ -32,6 +32,7 @@ tape("color(format) parses RGB integer format (e.g., \"rgb(12,34,56)\")", functi
 
 tape("color(format) parses RGB percentage format (e.g., \"rgb(12%,34%,56%)\")", function(test) {
   test.rgbEqual(color.color("rgb(12%,34%,56%)"), 31, 87, 143);
+  test.rgbStrictEqual(color.color("rgb(100%,100%,100%)"), 255, 255, 255);
   test.end();
 });