diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-14 21:28:39 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-14 21:28:39 +0200 |
| commit | b05e4d5f958892a9ff644b28a4ee165aeb2ea247 (patch) | |
| tree | 49c4237e12ae99f3f78e4b496b27dae4455db800 /addons/web_editor/static/src/js/editor | |
| parent | 5ac40752a4845340c4bd582075caaf0dd478d639 (diff) | |
| parent | a53bea49fe4005e3faaa3e63888da65a45281dd5 (diff) | |
[MERGE] forward port branch saas-15 up to a53bea49fe4
Diffstat (limited to 'addons/web_editor/static/src/js/editor')
| -rw-r--r-- | addons/web_editor/static/src/js/editor/rte.summernote.js | 2 |
1 files changed, 1 insertions, 1 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 7289359290e..2b1f516af84 100644 --- a/addons/web_editor/static/src/js/editor/rte.summernote.js +++ b/addons/web_editor/static/src/js/editor/rte.summernote.js @@ -472,7 +472,7 @@ function prettify_html(html) { while (i--) space += ' '; return space; }, - reg = /^<\/?(a|span|font|strong|u|i|strong|b)(\s|>)/i, + reg = /^<\/?(a|span|font|u|em|i|strong|b)(\s|>)/i, inline_level = Infinity, tokens = _.compact(_.flatten(_.map(html.split(/</), function (value) { value = value.replace(/\s+/g, ' ').split(/>/); |