diff options
Diffstat (limited to 'addons/web_editor/static/src')
| -rw-r--r-- | addons/web_editor/static/src/js/wysiwyg/plugin/text.js | 7 | ||||
| -rw-r--r-- | addons/web_editor/static/src/js/wysiwyg_snippets/snippets.options.js | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/addons/web_editor/static/src/js/wysiwyg/plugin/text.js b/addons/web_editor/static/src/js/wysiwyg/plugin/text.js index 2b7d10d02fd..f770b8121bf 100644 --- a/addons/web_editor/static/src/js/wysiwyg/plugin/text.js +++ b/addons/web_editor/static/src/js/wysiwyg/plugin/text.js @@ -679,7 +679,12 @@ var TextPlugin = AbstractPlugin.extend({ */ _removeIllegalClipboardElements: function ($clipboardData) { var root = true; - $clipboardData = $clipboardData.not('meta').not('style').not('script'); + $clipboardData.each(function (i, node) { + var tag = node.tagName; + if (tag === 'meta' || tag === 'style' || tag === 'script') { + $(node).remove(); + } + }); var $badNodes = this._filterIllegalClipboardElements($clipboardData); do { 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 f6eee549bfc..9515bf19ab6 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')); } } |
