From 6e1ed6c8bbce29e9cb23e14eab47fe3d1d09c3c9 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 14 Jan 2016 15:21:39 +0100 Subject: [FIX] web_editor: paste simple text must wrap first line by p and remove unless font --- addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'addons/web_editor/static/lib/summernote/src') 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 26b4ea86e46..1d5a99b31f5 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 @@ -144,9 +144,9 @@ define([ filter_tag($node.find('*'), $editable).removeAttr('title', 'alt', 'id', 'contenteditable'); /* - remove unless span + remove unless span and unwant font */ - $node.find('span:not([class]):not([style])').each(function () { + $node.find('span, font').filter(':not([class]):not([style])').each(function () { $(this).replaceWith($(this).contents()); }); $node.find('span + span').each(function () { @@ -169,6 +169,9 @@ define([ } else if (/h[0-9]+|li|table|p/i.test(this.tagName)) { $last = $('

'); $arch.append(this).append($last); + } else if ($arch.is(':empty') && dom.isText(this)) { + $last = $('

').append(this); + $arch.append($last); } else if (this.nodeType !== Node.COMMENT_NODE) { $last.append(this); } -- cgit v1.2.3