diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-08-30 17:20:28 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-08-30 17:20:28 +0200 |
| commit | 545e6d20344f37081ccd6c6e788ea1c5383717af (patch) | |
| tree | 7786f6001919ea18792c35c4f769336ef991fd3a /addons/web_editor/static/src/js | |
| parent | 513545cdbdf95ae61c068270ab61eec8b81c9bd8 (diff) | |
| parent | 52f6e38cea8ff9d16ab3432b3ccf032472e5a666 (diff) | |
[MERGE] forward port branch 12.0 up to 52f6e38cea8
Diffstat (limited to 'addons/web_editor/static/src/js')
| -rw-r--r-- | addons/web_editor/static/src/js/wysiwyg_snippets/snippets.options.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.options.js b/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.options.js index 5c7a41ae8f3..8ec600d14c5 100644 --- a/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.options.js +++ b/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.options.js @@ -776,7 +776,7 @@ registry.colorpicker = SnippetOption.extend({ if ($selected.length) { if ($selected.data('color')) { this.$target.addClass(this.colorPrefix + $selected.data('color')); - } else { + } else if ($selected.hasClass('o_custom_color')) { this.$target.css('background-color', $selected.css('background-color')); } } |