Skip to content

#161 - Modify isValid() to discriminate against improper formats used for colors #166

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

#161 - Modify isValid() to discriminate against improper formats used for colors #166

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e794740
Modified isValid() to discrimate against improperly formatted color o…
nyteksf Feb 5, 2018
77fecb4
Fixed whitespace issue
nyteksf Feb 5, 2018
95ca0c3
Adjust format
nyteksf Feb 5, 2018
2f33c19
Whitespace
nyteksf Feb 5, 2018
dadb109
Fixed mixed tabs and spaces, removed es6
nyteksf Feb 5, 2018
cb4c65e
Mixed tabs, spaces fix
nyteksf Feb 5, 2018
06449a8
re: prior
nyteksf Feb 5, 2018
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
34 changes: 28 additions & 6 deletions tinycolor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,15 +303,23 @@ tinycolor.fromRatio = function(color, opts) {
// "hsv(0, 100%, 100%)" or "hsv 0 100% 100%"
//
function inputToRGB(color) {

var rgb = { r: 0, g: 0, b: 0 };
var a = 1;
var s = null;
var v = null;
var l = null;
var ok = false;
var tooManyCommas = false;
var format = false;

var colorSplitToArray = "" + color.split(",");
for(var i=0, len=colorSplitToArray.length; i<len; i++) {
if (colorSplitToArray.split(",")[i] === "") {
tooManyCommas = true;
}
}

if (typeof color == "string") {
color = stringInputToObject(color);
}
Expand All @@ -330,18 +338,29 @@ function inputToRGB(color) {
format = "hsv";
}
else if (isValidCSSUnit(color.h) && isValidCSSUnit(color.s) && isValidCSSUnit(color.l)) {

color.s = color.s.slice(0, -1);
color.l = color.l.slice(0, -1);

if (color.h < 1 || color.h > 360 || color.s < 0 || color.s > 100 || color.l < 0 || color.l > 100) {
ok = false;
} else {
ok = true;
}
s = convertToPercentage(color.s);
l = convertToPercentage(color.l);
rgb = hslToRgb(color.h, s, l);
ok = true;
format = "hsl";
}

if (color.hasOwnProperty("a")) {
if (format === "hsl" && color.a > 1 || color.a < 0) {
ok = false;
}
a = color.a;
}
if (tooManyCommas) ok = false;
}

a = boundAlpha(a);

return {
Expand Down Expand Up @@ -1050,21 +1069,24 @@ function convertHexToDecimal(h) {

var matchers = (function() {



// <http://www.w3.org/TR/css3-values/#integers>
var CSS_INTEGER = "[-\\+]?\\d+%?";

// <http://www.w3.org/TR/css3-values/#number-value>
var CSS_NUMBER = "[-\\+]?\\d*\\.\\d+%?";

// Allow positive/negative integer/number. Don't capture the either/or, just the entire outcome.
var CSS_UNIT = "(?:" + CSS_NUMBER + ")|(?:" + CSS_INTEGER + ")";

// Actual matching.
// Parentheses and commas are optional, but not required.
// Whitespace can take the place of commas or opening paren
var PERMISSIVE_MATCH3 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";

var PERMISSIVE_MATCH4 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";

return {
CSS_UNIT: new RegExp(CSS_UNIT),
rgb: new RegExp("rgb" + PERMISSIVE_MATCH3),
Expand Down