diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-17 10:54:19 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-17 10:54:19 +0200 |
| commit | e9ae419fca0a9ebd0071c280bd98fc84f268bb74 (patch) | |
| tree | 8f33c2a81a60133b04df10d7e81afbc9d54c20a6 /addons/web_editor | |
| parent | 156d099e328304d0f19146f4714d13b7b572358a (diff) | |
| parent | 0de06a41326662d4505401764035bf9ddf31fc8b (diff) | |
[MERGE] forward port branch saas-11.3 up to 0de06a41326
Diffstat (limited to 'addons/web_editor')
| -rw-r--r-- | addons/web_editor/static/src/js/editor/snippets.options.js | 3 | ||||
| -rw-r--r-- | addons/web_editor/static/src/scss/web_editor.ui.scss | 3 |
2 files changed, 5 insertions, 1 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 097f3d3b12f..d452dfe07b8 100644 --- a/addons/web_editor/static/src/js/editor/snippets.options.js +++ b/addons/web_editor/static/src/js/editor/snippets.options.js @@ -754,6 +754,7 @@ registry.colorpicker = SnippetOption.extend({ */ _onColorResetButtonClick: function () { this.$target.removeClass(this.classes); + self.$target.trigger('content_changed'); this.$el.find('.colorpicker button.selected').removeClass('selected'); }, }); @@ -898,7 +899,7 @@ registry.background = SnippetOption.extend({ * @param {string} value */ _setCustomBackground: function (value) { - this.__customImageSrc = this._getSrcFromCssValue(value); + this.__customImageSrc = value; this.background(false, this.__customImageSrc); this.$target.addClass('oe_custom_bg'); this._setActive(); diff --git a/addons/web_editor/static/src/scss/web_editor.ui.scss b/addons/web_editor/static/src/scss/web_editor.ui.scss index 179f814c4b3..24ec59e8f61 100644 --- a/addons/web_editor/static/src/scss/web_editor.ui.scss +++ b/addons/web_editor/static/src/scss/web_editor.ui.scss @@ -1037,6 +1037,9 @@ body.editor_enable { left: 0; } } + .btn { + -webkit-user-select: initial; + } } #web_editor_inside_iframe { |