diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-01-17 18:04:57 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-01-17 18:04:57 +0100 |
| commit | 70f86ce4e8f4570f8a8b18e012b9af5326a5ce2a (patch) | |
| tree | 9ce23bce7bb979fa29c416aad21c14300903579f /addons/web_editor/static | |
| parent | c61e359fad9fdc2e7658a3e9f584fc40e0cfecf6 (diff) | |
| parent | 16fa61b34f919a39dc4094b74d77ab5ac054dc5e (diff) | |
[MERGE] forward port branch 9.0 up to 16fa61b34f9
Diffstat (limited to 'addons/web_editor/static')
| -rw-r--r-- | addons/web_editor/static/src/js/summernote.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js index 1abcd97245c..397d903be21 100644 --- a/addons/web_editor/static/src/js/summernote.js +++ b/addons/web_editor/static/src/js/summernote.js @@ -134,7 +134,7 @@ dom.hasProgrammaticStyle = function (node) { }; dom.mergeFilter = function (prev, cur, parent) { // merge text nodes - if (prev && (dom.isText(prev) || ("H1 H2 H3 H4 H5 H6 LI P".indexOf(prev.tagName) !== -1 && prev !== cur.parentNode)) && dom.isText(cur)) { + if (prev && (dom.isText(prev) || (['H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'LI', 'P'].indexOf(prev.tagName) !== -1 && prev !== cur.parentNode)) && dom.isText(cur)) { return true; } if (prev && prev.tagName === "P" && dom.isText(cur)) { |