summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src/js
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web_editor/static/src/js')
-rw-r--r--addons/web_editor/static/src/js/editor/summernote.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/editor/summernote.js b/addons/web_editor/static/src/js/editor/summernote.js
index 36f5becce06..71130f54afb 100644
--- a/addons/web_editor/static/src/js/editor/summernote.js
+++ b/addons/web_editor/static/src/js/editor/summernote.js
@@ -1259,9 +1259,11 @@ $.summernote.pluginEvents.enter = function (event, editor, layoutInfo) {
} else {
node = dom.splitTree(last, {'node': r.sc, 'offset': r.so}) || r.sc;
if (!contentBefore) {
+ // dom.node chooses the parent if node is text
var cur = dom.node(dom.lastChild(node.previousSibling));
if (!dom.isBR(cur)) {
- $(cur).html(br);
+ // We should concat what was before with a <br>
+ $(cur).html(cur.innerHTML + br.outerHTML);
}
}
if (!dom.isVisibleText(node)) {