|
2296 | 2296 | var hexRgbaRegex = /^#[a-fA-F0-9]{8}$/;
|
2297 | 2297 | var reducedHexRegex = /^#[a-fA-F0-9]{3}$/;
|
2298 | 2298 | var reducedRgbaHexRegex = /^#[a-fA-F0-9]{4}$/;
|
2299 |
| - var rgbRegex = /^rgb\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)$/i; |
2300 |
| - var rgbaRegex = /^rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*([-+]?[0-9]*[.]?[0-9]+)\s*\)$/i; |
2301 |
| - var hslRegex = /^hsl\(\s*(\d{0,3}[.]?[0-9]+)\s*,\s*(\d{1,3}[.]?[0-9]?)%\s*,\s*(\d{1,3}[.]?[0-9]?)%\s*\)$/i; |
2302 |
| - var hslaRegex = /^hsla\(\s*(\d{0,3}[.]?[0-9]+)\s*,\s*(\d{1,3}[.]?[0-9]?)%\s*,\s*(\d{1,3}[.]?[0-9]?)%\s*,\s*([-+]?[0-9]*[.]?[0-9]+)\s*\)$/i; |
| 2299 | + var rgbRegex = /^rgb\(\s*(\d{1,3})\s*(?:,)?\s*(\d{1,3})\s*(?:,)?\s*(\d{1,3})\s*\)$/i; |
| 2300 | + var rgbaRegex = /^rgb(?:a)?\(\s*(\d{1,3})\s*(?:,)?\s*(\d{1,3})\s*(?:,)?\s*(\d{1,3})\s*(?:,|\/)\s*([-+]?\d*[.]?\d+[%]?)\s*\)$/i; |
| 2301 | + var hslRegex = /^hsl\(\s*(\d{0,3}[.]?[0-9]+(?:deg)?)\s*(?:,)?\s*(\d{1,3}[.]?[0-9]?)%\s*(?:,)?\s*(\d{1,3}[.]?[0-9]?)%\s*\)$/i; |
| 2302 | + var hslaRegex = /^hsl(?:a)?\(\s*(\d{0,3}[.]?[0-9]+(?:deg)?)\s*(?:,)?\s*(\d{1,3}[.]?[0-9]?)%\s*(?:,)?\s*(\d{1,3}[.]?[0-9]?)%\s*(?:,|\/)\s*([-+]?\d*[.]?\d+[%]?)\s*\)$/i; |
2303 | 2303 | /**
|
2304 | 2304 | * Returns an RgbColor or RgbaColor object. This utility function is only useful
|
2305 | 2305 | * if want to extract a color component. With the color util `toColorString` you
|
|
2373 | 2373 | red: parseInt("" + rgbaMatched[1], 10),
|
2374 | 2374 | green: parseInt("" + rgbaMatched[2], 10),
|
2375 | 2375 | blue: parseInt("" + rgbaMatched[3], 10),
|
2376 |
| - alpha: parseFloat("" + rgbaMatched[4]) |
| 2376 | + alpha: parseFloat("" + rgbaMatched[4]) > 1 ? parseFloat("" + rgbaMatched[4]) / 100 : parseFloat("" + rgbaMatched[4]) |
2377 | 2377 | };
|
2378 | 2378 | }
|
2379 | 2379 |
|
|
2418 | 2418 | red: parseInt("" + _hslRgbMatched[1], 10),
|
2419 | 2419 | green: parseInt("" + _hslRgbMatched[2], 10),
|
2420 | 2420 | blue: parseInt("" + _hslRgbMatched[3], 10),
|
2421 |
| - alpha: parseFloat("" + hslaMatched[4]) |
| 2421 | + alpha: parseFloat("" + hslaMatched[4]) > 1 ? parseFloat("" + hslaMatched[4]) / 100 : parseFloat("" + hslaMatched[4]) |
2422 | 2422 | };
|
2423 | 2423 | }
|
2424 | 2424 |
|
|
0 commit comments