From 41be0453e658ba5a2628d982ce0534df1d3faecc Mon Sep 17 00:00:00 2001 From: tophf Date: Sun, 14 Jul 2019 09:33:13 +0300 Subject: [PATCH] restore scientific number notation support in colors rgba(1.5E2 0 0 / .5e2%) --- vendor-overwrites/colorpicker/colorconverter.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vendor-overwrites/colorpicker/colorconverter.js b/vendor-overwrites/colorpicker/colorconverter.js index 3c175976..17eea98a 100644 --- a/vendor-overwrites/colorpicker/colorconverter.js +++ b/vendor-overwrites/colorpicker/colorconverter.js @@ -54,12 +54,14 @@ const colorConverter = (() => { } function validatePercentage(s) { - const match = s.match(/^(\d+|\d*\.\d+)%$/); - return match && Number(match[1]) >= 0 && Number(match[1]) <= 100; + if (!s.endsWith('%')) return false; + const n = Number(s.slice(0, -1)); + return n >= 0 && n <= 100; } function validateNum(s) { - return /^\d+$/.test(s) && Number(s) >= 0 && Number(s) <= 255; + const n = Number(s); + return n >= 0 && n <= 255; } function validateHSL(nums) { @@ -74,7 +76,8 @@ const colorConverter = (() => { if (alpha.endsWith('%')) { return validatePercentage(alpha); } - return Number(alpha) >= 0 && Number(alpha) <= 1; + const n = Number(alpha); + return n >= 0 && n <= 1; } function parse(str) {