diff options
| author | Olivier Dony <odo@openerp.com> | 2017-06-01 00:37:30 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2017-06-01 00:37:30 +0200 |
| commit | 5dd2cc8e6320c631a511c6dac98ae40e54d4a94d (patch) | |
| tree | ad5f44653ac11d4a8bdec256de4d20adda94091d /addons/web_editor/static/src/js/rte.summernote.js | |
| parent | 20c724479f2092f2d5f0b3c96f15bd6162e07968 (diff) | |
| parent | b9e220726730e2e0c25dae9952fa90e783fadc16 (diff) | |
[MERGE] Forward-port saas-14 up to b9e220726730e2e0c25dae9952fa90e783fadc16
Diffstat (limited to 'addons/web_editor/static/src/js/rte.summernote.js')
| -rw-r--r-- | addons/web_editor/static/src/js/rte.summernote.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/rte.summernote.js index 60c096603d8..4ab1e7bed06 100644 --- a/addons/web_editor/static/src/js/rte.summernote.js +++ b/addons/web_editor/static/src/js/rte.summernote.js @@ -511,7 +511,12 @@ function prettify_html(html) { level--; } - result += token.trim().replace(/\s+/, ' '); + // don't trim inline content (which could change appearance) + if (!inline) { + token = token.trim(); + } + + result += token.replace(/\s+/, ' '); if (inline_level > level) { result += '\n'; |