From 4e48c3ce0fb9d572658083cf1d42170c8f020600 Mon Sep 17 00:00:00 2001 From: Benjamin Vray Date: Tue, 10 Mar 2020 11:06:01 +0000 Subject: [PATCH] [FIX] web_editor: allow non-alphabetic unit in data-unit Allow non-alphabetic unit (like percentage) as data-unit value. task-2194309 closes odoo/odoo#47325 X-original-commit: 1f3dd221134b7b5e5b0eac0ab2ffe447771998b9 Signed-off-by: Quentin Smetz (qsm) --- addons/web_editor/static/src/js/common/utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web_editor/static/src/js/common/utils.js b/addons/web_editor/static/src/js/common/utils.js index 621af93829c..6600abc6aaa 100644 --- a/addons/web_editor/static/src/js/common/utils.js +++ b/addons/web_editor/static/src/js/common/utils.js @@ -103,11 +103,11 @@ function _convertNumericToUnit(value, unitFrom, unitTo, cssProp, $target) { * @returns {Array|null} */ function _getNumericAndUnit(value) { - const m = value.trim().match(/^(-?[0-9.]+)(\w*)$/); + const m = value.trim().match(/^(-?[0-9.]+)([A-Za-z% -]*)$/); if (!m) { return null; } - return [m[1], m[2]]; + return [m[1].trim(), m[2].trim()]; } /** * Checks if two css values are equal.