diff --git a/csscolorparser.js b/csscolorparser.js index e9d7298..4dba075 100644 --- a/csscolorparser.js +++ b/csscolorparser.js @@ -82,6 +82,7 @@ var kCSSColorTable = { "peachpuff": [255,218,185,1], "peru": [205,133,63,1], "pink": [255,192,203,1], "plum": [221,160,221,1], "powderblue": [176,224,230,1], "purple": [128,0,128,1], + "rebeccapurple": [102,51,153,1], "red": [255,0,0,1], "rosybrown": [188,143,143,1], "royalblue": [65,105,225,1], "saddlebrown": [139,69,19,1], "salmon": [250,128,114,1], "sandybrown": [244,164,96,1], @@ -141,12 +142,12 @@ function parseCSSColor(css_str) { var iv = parseInt(str.substr(1), 16); // TODO(deanm): Stricter parsing. if (!(iv >= 0 && iv <= 0xfff)) return null; // Covers NaN. return [((iv & 0xf00) >> 4) | ((iv & 0xf00) >> 8), - (iv & 0xf) | ((iv & 0xf) << 4), (iv & 0xf0) | ((iv & 0xf0) >> 4), + (iv & 0xf) | ((iv & 0xf) << 4), 1]; } else if (str.length === 7) { var iv = parseInt(str.substr(1), 16); // TODO(deanm): Stricter parsing. - if (!(iv >= 0 && iv < 0xffffff)) return null; // Covers NaN. + if (!(iv >= 0 && iv <= 0xffffff)) return null; // Covers NaN. return [(iv & 0xff0000) >> 16, (iv & 0xff00) >> 8, iv & 0xff, diff --git a/package.json b/package.json index e84aaf3..9f77117 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,12 @@ { "name": "csscolorparser", - "version": "1.0.0", + "version": "1.0.3", "author": "Dean McNamee ", "keywords": ["css", "color", "html5", "parser"], "repository": { "type": "git", "url": "https://github.com/deanm/css-color-parser-js" }, + "license": "MIT", "main": "csscolorparser.js" }