Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue where color-string with incorrectly return a color for properties on Object's prototype like "constructor". #45

Closed
wants to merge 1 commit into from
Closed

Fix issue where color-string with incorrectly return a color for properties on Object's prototype like "constructor". #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
/* MIT license */
var colorNames = require('color-name');
var swizzle = require('simple-swizzle');
var hasOwnProperty = Object.hasOwnProperty;

var reverseNames = {};

// create a list of reverse color names
for (var name in colorNames) {
if (colorNames.hasOwnProperty(name)) {
if (hasOwnProperty.call(colorNames, name)) {
reverseNames[colorNames[name]] = name;
}
}
Expand Down Expand Up @@ -103,12 +104,11 @@ cs.get.rgb = function (string) {
return [0, 0, 0, 0];
}

rgb = colorNames[match[1]];

if (!rgb) {
if (!hasOwnProperty.call(colorNames, match[1])) {
return null;
}

rgb = colorNames[match[1]];
rgb[3] = 1;

return rgb;
Expand Down