diff options
| author | qsm-odoo <qsm@odoo.com> | 2020-01-09 12:41:26 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2020-01-09 12:50:10 +0000 |
| commit | c197d3f8bfc062dad216e5a5e1f64277996560d3 (patch) | |
| tree | 12180a72b1b744248ea40e7cdb4a72ebf6ab97d0 /addons/web_editor/static/src | |
| parent | e92305856881014ec029eb3d3cb80ee972756de6 (diff) | |
[FIX] web_editor: properly combine we-colorpicker Class attributes
Part of https://github.com/odoo/odoo/pull/42986
Diffstat (limited to 'addons/web_editor/static/src')
| -rw-r--r-- | addons/web_editor/static/src/js/editor/snippets.options.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/web_editor/static/src/js/editor/snippets.options.js b/addons/web_editor/static/src/js/editor/snippets.options.js index f01e3ebd310..2f41fb2060b 100644 --- a/addons/web_editor/static/src/js/editor/snippets.options.js +++ b/addons/web_editor/static/src/js/editor/snippets.options.js @@ -925,13 +925,13 @@ const MultiUserValueWidget = UserValueWidget.extend({ }); const ColorpickerUserValueWidget = SelectUserValueWidget.extend({ - className: (ButtonUserValueWidget.prototype.className || '') + ' o_we_so_color_palette', - custom_events: { + className: (SelectUserValueWidget.prototype.className || '') + ' o_we_so_color_palette', + custom_events: _.extend({}, SelectUserValueWidget.prototype.custom_events, { 'color_picked': '_onColorPicked', 'color_hover': '_onColorHovered', 'color_leave': '_onColorLeft', 'color_reset': '_onColorReset', - }, + }), /** * @override |