From 89d473b479ea01f9d5e7e5d22365a612d24787ef Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Mon, 21 Jan 2019 10:58:29 +0000 Subject: [PATCH] [FIX] web_editor: restore colorpicker opacity initialization Following the new editor's merge at https://github.com/odoo/odoo/pull/29775, the colorpicker was not properly initializing the opacity component of the given color anymore. closes odoo/odoo#30371 --- .../static/src/js/wysiwyg/widgets/colorpicker_dialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/colorpicker_dialog.js b/addons/web_editor/static/src/js/wysiwyg/widgets/colorpicker_dialog.js index 3538b1ad874..e462d8bbeb8 100644 --- a/addons/web_editor/static/src/js/wysiwyg/widgets/colorpicker_dialog.js +++ b/addons/web_editor/static/src/js/wysiwyg/widgets/colorpicker_dialog.js @@ -391,13 +391,13 @@ ColorpickerDialog.convertColorToRgba = function (color) { var rgba = color.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d+(?:\.\d+)?))?\)$/); if (rgba) { if (rgba[4] === undefined) { - rgba[4] = 100; + rgba[4] = 1; } return { red: parseInt(rgba[1]), green: parseInt(rgba[2]), blue: parseInt(rgba[3]), - opacity: parseInt(rgba[4]), + opacity: Math.round(parseFloat(rgba[4]) * 100), }; } else { return ColorpickerDialog.convertHexToRgba(color);