diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-01-17 19:12:20 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-01-17 19:12:20 +0100 |
| commit | 44276dfdc3b69cd9b834bfa7037671558e6d0078 (patch) | |
| tree | 3c47b0f1ac90900c2741b4174e3a088c6c15e8d5 /addons/web_editor/static/src/js/summernote.js | |
| parent | ffe13756f5717088dbe13f042a92ae0ea8ba2a73 (diff) | |
| parent | a0aca47feff06bb9c2aa5d5dbc056680ce27cbba (diff) | |
[MERGE] forward port branch saas-11 up to a0aca47feff
Diffstat (limited to 'addons/web_editor/static/src/js/summernote.js')
| -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 5c344fbbcd1..9d7304caf75 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)) { |