summaryrefslogtreecommitdiff
path: root/addons/web_editor/static
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2018-01-25 12:38:32 +0100
committerqsm-odoo <qsm@odoo.com>2018-01-25 13:58:59 +0100
commitfb81c331f869a06ffa9332a294492d4307ea65b3 (patch)
tree1de01847dd27fc51b267bead28089127bfc2dda5 /addons/web_editor/static
parentedac5550ec4cf38236f54278c9f2e11a59c3ebbf (diff)
[FIX] web_editor: fix double Shift + Enter
Pressing Shift + Enter twice was buggy because of small refactoring made by https://github.com/odoo/odoo/commit/c227b8fd88e0ed635a8e807501b559b46fee7786#diff-cc5180b5ec2395c1df5c4e475aff43fbL416 opw-806003
Diffstat (limited to 'addons/web_editor/static')
-rw-r--r--addons/web_editor/static/src/js/rte.summernote.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/rte.summernote.js
index 5f28c9510bb..b8f3198dae2 100644
--- a/addons/web_editor/static/src/js/rte.summernote.js
+++ b/addons/web_editor/static/src/js/rte.summernote.js
@@ -422,6 +422,9 @@ dom.isImg = function (node) {
};
var fn_is_forbidden_node = dom.isForbiddenNode || function () {};
dom.isForbiddenNode = function (node) {
+ if (node.tagName === "BR") {
+ return false;
+ }
return fn_is_forbidden_node(node) || $(node).is(".media_iframe_video");
};
var fn_is_img_font = dom.isImgFont || function () {};