From 6da7628b868faae6e37f0b12a8749341668f0ab0 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 7 Nov 2016 14:34:29 +0100 Subject: [FIX] web_editor: split h5,h3,...p... node to insert table opw-686393 --- addons/web_editor/static/src/js/summernote.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'addons/web_editor/static/src/js/summernote.js') diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js index 00cd04ac16b..e08f0680663 100644 --- a/addons/web_editor/static/src/js/summernote.js +++ b/addons/web_editor/static/src/js/summernote.js @@ -936,12 +936,19 @@ $.summernote.pluginEvents.insertTable = function (event, editor, layoutInfo, sDi var dimension = sDim.split('x'); var r = range.create(); if (!r) return; - r = r.deleteContents(); + r = r.deleteContents(true); - var isBodyContainer = dom.isBodyContainer; - dom.isBodyContainer = dom.isNotBreakable; - r.insertNode(editor.table.createTable(dimension[0], dimension[1])); - dom.isBodyContainer = isBodyContainer; + var table = editor.table.createTable(dimension[0], dimension[1]); + var parent = r.sc; + while (dom.isText(parent.parentNode) || dom.isRemovableEmptyNode(parent.parentNode)) { + parent = parent.parentNode; + } + var node = dom.splitTree(parent, {'node': r.sc, 'offset': r.so}) || r.sc; + node.parentNode.insertBefore(table, node); + + if ($(node).text() === '' || node.textContent === '\u00A0') { + node.parentNode.removeChild(node); + } editor.afterCommand($editable); event.preventDefault(); -- cgit v1.2.3