summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/lib/summernote/src
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web_editor/static/lib/summernote/src')
-rw-r--r--addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js8
1 files changed, 8 insertions, 0 deletions
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js b/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js
index 419f52c8fc3..8b42726ff7a 100644
--- a/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js
+++ b/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js
@@ -150,6 +150,14 @@ define([
$(this).replaceWith($(this).contents());
});
$node.find('span + span').each(function () {
+
+ if (dom.isText(this.previousSibling)) {
+ if (dom.isVisibleText(this.previousSibling)) {
+ return;
+ } else { // keep space between 2 tags, but can merge the both tags
+ $(this).prev().append(this.previousSibling);
+ }
+ }
if ($(this).attr('class') === $(this).prev().attr('class') && $(this).attr('style') === $(this).prev().attr('style')) {
$(this).prev().append($(this).contents());
$(this).remove();