github/holder
1
1
Fork 0
mirror of https://github.com/imsky/holder.git synced 2026-01-10 06:18:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #227 from jtanadi/rgba-leading-zero

Browse Source 
rgba without leading zero
This commit is contained in:
Ivan Malopinsky
2020-04-14 09:53:41 -04:00
committed by GitHub
parent 220827ebe4 cfcdcd9386
commit 0a1dd0705f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/utils.js
View File

@@ -122,7 +122,7 @@ exports.truthy = function(val) {
exports.parseColor = function(val) {
var hexre = /(^(?:#?)[0-9a-f]{6}$)|(^(?:#?)[0-9a-f]{3}$)/i;
var rgbre = /^rgb\((\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)$/;
var rgbare = /^rgba\((\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(0\.\d{1,}|1)\)$/;
var rgbare = /^rgba\((\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(0*\.\d{1,}|1)\)$/;
var match = val.match(hexre);
var retval;
@@ -146,7 +146,9 @@ exports.parseColor = function(val) {
match = val.match(rgbare);
if (match !== null) {
retval = 'rgba(' + match.slice(1).join(',') + ')';
const normalizeAlpha = a => `0.${a.split('.')[1]}`
const fixedMatch = match.slice(1).map((e, i) => (i === 3) ? normalizeAlpha(e) : e)
retval = 'rgba(' + fixedMatch.join(',') + ')';
return retval;
}
@@ -170,4 +172,4 @@ exports.canvasRatio = function () {
}
return devicePixelRatio / backingStoreRatio;
};
};