scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2024-12-29 09:22:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve hex Color parser

Browse source 
Addresses changes in #1469
This commit is contained in:
Jürg Lehni 2018-10-06 21:57:30 +02:00
parent fb47244787
commit fd1a517e84
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/style/Color.js
View file

@ -59,21 +59,22 @@ var Color = Base.extend(new function() {
colorCtx;
function fromCSS(string) {
var match = string.match(/^#(\w{1,2})(\w{1,2})(\w{1,2})$/),
var match = string.match(
/^#([\da-f]{2})([\da-f]{2})([\da-f]{2})([\da-f]{2})?$/i
) || string.match(
/^#([\da-f])([\da-f])([\da-f])$/i
),
type = 'rgb',
components;
if (/^#[A-Fa-f0-9]+$/.test( string )) {
// HEX / HEX+A
var base = string.replace(/^#/,'');
var size = base.length;
components = base.split( size <= 4 ? /(.)/ : /(..)/ );
components = components.filter(Boolean).map(function(x) {
return parseInt(size <= 4 ? x + x : x, 16) / 255;
});
if ( !components[0] ) components[0] = 0;
if ( !components[1] ) components[1] = 0;
if ( !components[2] ) components[2] = 0;
if (match) {
// Hex with optional alpha channel:
var amount = match[4] ? 4 : 3;
components = new Array(amount);
for (var i = 0; i < amount; i++) {
var value = match[i + 1];
components[i] = parseInt(value.length == 1
? value + value : value, 16) / 255;
}
} else if (match = string.match(/^(rgb|hsl)a?\((.*)\)$/)) {
// RGB / RGBA or HSL / HSLA
type = match[1];

3
test/tests/Color.js
View file

@ -66,6 +66,9 @@ test('Creating Colors', function() {
equals(new Color('#ff0000'), new Color(1, 0, 0),
'Color from hex string');
equals(new Color('#FF3300'), new Color(1, 0.2, 0),
'Color from hex string');
equals(new Color('#ff000099'), new Color(1, 0, 0, .6),
'Color from hex code with alpha');