diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-01 18:15:21 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-01 18:15:21 +0100 |
| commit | 7e469eb77aae1f7e05a3ce0f6575b5149fed3ca1 (patch) | |
| tree | 25023238fd6ccde1f3b8e805b03fcf228798a7b0 /addons/web_editor/static/src/js/editor/rte.summernote.js | |
| parent | c4895c2f2ba0fcd8fc5aef210003c20ba2154979 (diff) | |
| parent | f5e7b866860436782ade53308da1ff725be1f124 (diff) | |
[MERGE] forward port branch 11.0 up to f5e7b866860
Diffstat (limited to 'addons/web_editor/static/src/js/editor/rte.summernote.js')
| -rw-r--r-- | addons/web_editor/static/src/js/editor/rte.summernote.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/web_editor/static/src/js/editor/rte.summernote.js b/addons/web_editor/static/src/js/editor/rte.summernote.js index fb1ce3e12b4..2ac9df2d693 100644 --- a/addons/web_editor/static/src/js/editor/rte.summernote.js +++ b/addons/web_editor/static/src/js/editor/rte.summernote.js @@ -417,6 +417,9 @@ dom.isImg = function (node) { }; var fn_is_forbidden_node = dom.isForbiddenNode || function () {}; dom.isForbiddenNode = function (node) { + if (node.tagName === "BR") { + return false; + } return fn_is_forbidden_node(node) || $(node).is(".media_iframe_video"); }; var fn_is_img_font = dom.isImgFont || function () {}; |
