summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@odoo.com>2015-01-20 01:15:40 +0100
committerChristophe Matthieu <chm@odoo.com>2015-01-23 12:14:14 +0100
commit5bec4b899633e7a2143bbbdcaf7592a485aec75f (patch)
tree19e2c7d134c3cf4333acd3255ffb64b8e024f7c6 /addons/website/static/src/js
parent7b38e1dd62e7cd647a0ef836898087293fe5f8ae (diff)
[FIX] website editor: backspace does not merge like delete
Diffstat (limited to 'addons/website/static/src/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 2fb4c603c9c..83c9b519ace 100644
--- a/addons/website/static/src/js/summernote.js
+++ b/addons/website/static/src/js/summernote.js
@@ -344,7 +344,7 @@ define(['summernote/editing/Editor', 'summernote/summernote'], function (Editor)
temp.tagName === node.tagName &&
!dom.isText(node) &&
dom.isMergable(node) &&
- !dom.isNotBreakable(node) && !dom.isNotBreakable(dom.nextElementSibling(node))) {
+ !dom.isNotBreakable(node) && !dom.isNotBreakable(previous ? dom.previousElementSibling(node) : dom.nextElementSibling(node))) {
if (previous) {
dom.doMerge(temp, node);