summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js/summernote.js
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@odoo.com>2015-03-23 10:20:27 +0100
committerChristophe Matthieu <chm@odoo.com>2015-03-23 12:25:06 +0100
commit2f5e4149fbaa1cbd832541f1f5849a9ed65d931e (patch)
treed2b218798eff56c73524d4073736d6f63cdad635 /addons/website/static/src/js/summernote.js
parent421693d95253d55efca20c361f50def6f212cf22 (diff)
[FIX] summernote: wrap the content with p when the user keyup on 'enter' but should not wrap the content if the editable area is a p, li or other para
Diffstat (limited to 'addons/website/static/src/js/summernote.js')
-rw-r--r--addons/website/static/src/js/summernote.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/website/static/src/js/summernote.js b/addons/website/static/src/js/summernote.js
index cc1c88af799..69b45ff1f06 100644
--- a/addons/website/static/src/js/summernote.js
+++ b/addons/website/static/src/js/summernote.js
@@ -1026,7 +1026,7 @@ define(['summernote/editing/Editor', 'summernote/summernote'], function (Editor)
var node = dom.node(r.sc);
var last = node;
- while (node && dom.isSplitable(node) && !dom.isList(node)) {
+ while (node && dom.isSplitable(node) && !dom.isList(node) && !dom.isEditable(node)) {
last = node;
node = node.parentNode;
}