Skip to content

Commit

Permalink
Remove Map polyfill. Fixes #15 #16.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mbostock
mbostock committed Sep 15, 2015
1 parent 3767ff9 commit 37a1c77
Show file tree
Hide file tree
Showing 2 changed files with 153 additions and 152 deletions.
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "d3-color",
"version": "0.2.4",
"version": "0.2.5",
"description": "Color spaces! RGB, HSL, Cubehelix, Lab and HCL (Lch).",
"keywords": [
"d3",
Expand All @@ -25,7 +25,7 @@
"url": "https://github.com/d3/d3-color.git"
},
"scripts": {
"pretest": "mkdir -p build && d3-bundler --polyfill-map --format=umd --name=color -- index.js > build/color.js",
"pretest": "mkdir -p build && d3-bundler --format=umd --name=color -- index.js > build/color.js",
"test": "faucet `find test -name '*-test.js'`",
"prepublish": "npm run test && uglifyjs build/color.js -c -m -o build/color.min.js && rm -f build/color.zip && zip -j build/color.zip -- LICENSE README.md build/color.js build/color.min.js"
},
Expand Down
301 changes: 151 additions & 150 deletions src/color.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,160 +26,161 @@ export default function color(format) {
: (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%)
: named.has(format) ? rgbn(named.get(format))
: named.hasOwnProperty(format) ? rgbn(named[format])
: null;
};

function rgbn(n) {
return rgb(n >> 16 & 0xff, n >> 8 & 0xff, n & 0xff);
}

var named = (new Map)
.set("aliceblue", 0xf0f8ff)
.set("antiquewhite", 0xfaebd7)
.set("aqua", 0x00ffff)
.set("aquamarine", 0x7fffd4)
.set("azure", 0xf0ffff)
.set("beige", 0xf5f5dc)
.set("bisque", 0xffe4c4)
.set("black", 0x000000)
.set("blanchedalmond", 0xffebcd)
.set("blue", 0x0000ff)
.set("blueviolet", 0x8a2be2)
.set("brown", 0xa52a2a)
.set("burlywood", 0xdeb887)
.set("cadetblue", 0x5f9ea0)
.set("chartreuse", 0x7fff00)
.set("chocolate", 0xd2691e)
.set("coral", 0xff7f50)
.set("cornflowerblue", 0x6495ed)
.set("cornsilk", 0xfff8dc)
.set("crimson", 0xdc143c)
.set("cyan", 0x00ffff)
.set("darkblue", 0x00008b)
.set("darkcyan", 0x008b8b)
.set("darkgoldenrod", 0xb8860b)
.set("darkgray", 0xa9a9a9)
.set("darkgreen", 0x006400)
.set("darkgrey", 0xa9a9a9)
.set("darkkhaki", 0xbdb76b)
.set("darkmagenta", 0x8b008b)
.set("darkolivegreen", 0x556b2f)
.set("darkorange", 0xff8c00)
.set("darkorchid", 0x9932cc)
.set("darkred", 0x8b0000)
.set("darksalmon", 0xe9967a)
.set("darkseagreen", 0x8fbc8f)
.set("darkslateblue", 0x483d8b)
.set("darkslategray", 0x2f4f4f)
.set("darkslategrey", 0x2f4f4f)
.set("darkturquoise", 0x00ced1)
.set("darkviolet", 0x9400d3)
.set("deeppink", 0xff1493)
.set("deepskyblue", 0x00bfff)
.set("dimgray", 0x696969)
.set("dimgrey", 0x696969)
.set("dodgerblue", 0x1e90ff)
.set("firebrick", 0xb22222)
.set("floralwhite", 0xfffaf0)
.set("forestgreen", 0x228b22)
.set("fuchsia", 0xff00ff)
.set("gainsboro", 0xdcdcdc)
.set("ghostwhite", 0xf8f8ff)
.set("gold", 0xffd700)
.set("goldenrod", 0xdaa520)
.set("gray", 0x808080)
.set("green", 0x008000)
.set("greenyellow", 0xadff2f)
.set("grey", 0x808080)
.set("honeydew", 0xf0fff0)
.set("hotpink", 0xff69b4)
.set("indianred", 0xcd5c5c)
.set("indigo", 0x4b0082)
.set("ivory", 0xfffff0)
.set("khaki", 0xf0e68c)
.set("lavender", 0xe6e6fa)
.set("lavenderblush", 0xfff0f5)
.set("lawngreen", 0x7cfc00)
.set("lemonchiffon", 0xfffacd)
.set("lightblue", 0xadd8e6)
.set("lightcoral", 0xf08080)
.set("lightcyan", 0xe0ffff)
.set("lightgoldenrodyellow", 0xfafad2)
.set("lightgray", 0xd3d3d3)
.set("lightgreen", 0x90ee90)
.set("lightgrey", 0xd3d3d3)
.set("lightpink", 0xffb6c1)
.set("lightsalmon", 0xffa07a)
.set("lightseagreen", 0x20b2aa)
.set("lightskyblue", 0x87cefa)
.set("lightslategray", 0x778899)
.set("lightslategrey", 0x778899)
.set("lightsteelblue", 0xb0c4de)
.set("lightyellow", 0xffffe0)
.set("lime", 0x00ff00)
.set("limegreen", 0x32cd32)
.set("linen", 0xfaf0e6)
.set("magenta", 0xff00ff)
.set("maroon", 0x800000)
.set("mediumaquamarine", 0x66cdaa)
.set("mediumblue", 0x0000cd)
.set("mediumorchid", 0xba55d3)
.set("mediumpurple", 0x9370db)
.set("mediumseagreen", 0x3cb371)
.set("mediumslateblue", 0x7b68ee)
.set("mediumspringgreen", 0x00fa9a)
.set("mediumturquoise", 0x48d1cc)
.set("mediumvioletred", 0xc71585)
.set("midnightblue", 0x191970)
.set("mintcream", 0xf5fffa)
.set("mistyrose", 0xffe4e1)
.set("moccasin", 0xffe4b5)
.set("navajowhite", 0xffdead)
.set("navy", 0x000080)
.set("oldlace", 0xfdf5e6)
.set("olive", 0x808000)
.set("olivedrab", 0x6b8e23)
.set("orange", 0xffa500)
.set("orangered", 0xff4500)
.set("orchid", 0xda70d6)
.set("palegoldenrod", 0xeee8aa)
.set("palegreen", 0x98fb98)
.set("paleturquoise", 0xafeeee)
.set("palevioletred", 0xdb7093)
.set("papayawhip", 0xffefd5)
.set("peachpuff", 0xffdab9)
.set("peru", 0xcd853f)
.set("pink", 0xffc0cb)
.set("plum", 0xdda0dd)
.set("powderblue", 0xb0e0e6)
.set("purple", 0x800080)
.set("rebeccapurple", 0x663399)
.set("red", 0xff0000)
.set("rosybrown", 0xbc8f8f)
.set("royalblue", 0x4169e1)
.set("saddlebrown", 0x8b4513)
.set("salmon", 0xfa8072)
.set("sandybrown", 0xf4a460)
.set("seagreen", 0x2e8b57)
.set("seashell", 0xfff5ee)
.set("sienna", 0xa0522d)
.set("silver", 0xc0c0c0)
.set("skyblue", 0x87ceeb)
.set("slateblue", 0x6a5acd)
.set("slategray", 0x708090)
.set("slategrey", 0x708090)
.set("snow", 0xfffafa)
.set("springgreen", 0x00ff7f)
.set("steelblue", 0x4682b4)
.set("tan", 0xd2b48c)
.set("teal", 0x008080)
.set("thistle", 0xd8bfd8)
.set("tomato", 0xff6347)
.set("turquoise", 0x40e0d0)
.set("violet", 0xee82ee)
.set("wheat", 0xf5deb3)
.set("white", 0xffffff)
.set("whitesmoke", 0xf5f5f5)
.set("yellow", 0xffff00)
.set("yellowgreen", 0x9acd32);
var named = {
aliceblue: 0xf0f8ff,
antiquewhite: 0xfaebd7,
aqua: 0x00ffff,
aquamarine: 0x7fffd4,
azure: 0xf0ffff,
beige: 0xf5f5dc,
bisque: 0xffe4c4,
black: 0x000000,
blanchedalmond: 0xffebcd,
blue: 0x0000ff,
blueviolet: 0x8a2be2,
brown: 0xa52a2a,
burlywood: 0xdeb887,
cadetblue: 0x5f9ea0,
chartreuse: 0x7fff00,
chocolate: 0xd2691e,
coral: 0xff7f50,
cornflowerblue: 0x6495ed,
cornsilk: 0xfff8dc,
crimson: 0xdc143c,
cyan: 0x00ffff,
darkblue: 0x00008b,
darkcyan: 0x008b8b,
darkgoldenrod: 0xb8860b,
darkgray: 0xa9a9a9,
darkgreen: 0x006400,
darkgrey: 0xa9a9a9,
darkkhaki: 0xbdb76b,
darkmagenta: 0x8b008b,
darkolivegreen: 0x556b2f,
darkorange: 0xff8c00,
darkorchid: 0x9932cc,
darkred: 0x8b0000,
darksalmon: 0xe9967a,
darkseagreen: 0x8fbc8f,
darkslateblue: 0x483d8b,
darkslategray: 0x2f4f4f,
darkslategrey: 0x2f4f4f,
darkturquoise: 0x00ced1,
darkviolet: 0x9400d3,
deeppink: 0xff1493,
deepskyblue: 0x00bfff,
dimgray: 0x696969,
dimgrey: 0x696969,
dodgerblue: 0x1e90ff,
firebrick: 0xb22222,
floralwhite: 0xfffaf0,
forestgreen: 0x228b22,
fuchsia: 0xff00ff,
gainsboro: 0xdcdcdc,
ghostwhite: 0xf8f8ff,
gold: 0xffd700,
goldenrod: 0xdaa520,
gray: 0x808080,
green: 0x008000,
greenyellow: 0xadff2f,
grey: 0x808080,
honeydew: 0xf0fff0,
hotpink: 0xff69b4,
indianred: 0xcd5c5c,
indigo: 0x4b0082,
ivory: 0xfffff0,
khaki: 0xf0e68c,
lavender: 0xe6e6fa,
lavenderblush: 0xfff0f5,
lawngreen: 0x7cfc00,
lemonchiffon: 0xfffacd,
lightblue: 0xadd8e6,
lightcoral: 0xf08080,
lightcyan: 0xe0ffff,
lightgoldenrodyellow: 0xfafad2,
lightgray: 0xd3d3d3,
lightgreen: 0x90ee90,
lightgrey: 0xd3d3d3,
lightpink: 0xffb6c1,
lightsalmon: 0xffa07a,
lightseagreen: 0x20b2aa,
lightskyblue: 0x87cefa,
lightslategray: 0x778899,
lightslategrey: 0x778899,
lightsteelblue: 0xb0c4de,
lightyellow: 0xffffe0,
lime: 0x00ff00,
limegreen: 0x32cd32,
linen: 0xfaf0e6,
magenta: 0xff00ff,
maroon: 0x800000,
mediumaquamarine: 0x66cdaa,
mediumblue: 0x0000cd,
mediumorchid: 0xba55d3,
mediumpurple: 0x9370db,
mediumseagreen: 0x3cb371,
mediumslateblue: 0x7b68ee,
mediumspringgreen: 0x00fa9a,
mediumturquoise: 0x48d1cc,
mediumvioletred: 0xc71585,
midnightblue: 0x191970,
mintcream: 0xf5fffa,
mistyrose: 0xffe4e1,
moccasin: 0xffe4b5,
navajowhite: 0xffdead,
navy: 0x000080,
oldlace: 0xfdf5e6,
olive: 0x808000,
olivedrab: 0x6b8e23,
orange: 0xffa500,
orangered: 0xff4500,
orchid: 0xda70d6,
palegoldenrod: 0xeee8aa,
palegreen: 0x98fb98,
paleturquoise: 0xafeeee,
palevioletred: 0xdb7093,
papayawhip: 0xffefd5,
peachpuff: 0xffdab9,
peru: 0xcd853f,
pink: 0xffc0cb,
plum: 0xdda0dd,
powderblue: 0xb0e0e6,
purple: 0x800080,
rebeccapurple: 0x663399,
red: 0xff0000,
rosybrown: 0xbc8f8f,
royalblue: 0x4169e1,
saddlebrown: 0x8b4513,
salmon: 0xfa8072,
sandybrown: 0xf4a460,
seagreen: 0x2e8b57,
seashell: 0xfff5ee,
sienna: 0xa0522d,
silver: 0xc0c0c0,
skyblue: 0x87ceeb,
slateblue: 0x6a5acd,
slategray: 0x708090,
slategrey: 0x708090,
snow: 0xfffafa,
springgreen: 0x00ff7f,
steelblue: 0x4682b4,
tan: 0xd2b48c,
teal: 0x008080,
thistle: 0xd8bfd8,
tomato: 0xff6347,
turquoise: 0x40e0d0,
violet: 0xee82ee,
wheat: 0xf5deb3,
white: 0xffffff,
whitesmoke: 0xf5f5f5,
yellow: 0xffff00,
yellowgreen: 0x9acd32
};

0 comments on commit 37a1c77

Please sign in to comment.