From 2c49337a7dba1ad424843c6dc460743dbba0c815 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 9 Mar 2017 15:16:00 +0100 Subject: [PATCH 1/1] empty text nodes after spans (cherry picked from commit 091b7b5) --- src/editor/plugins/core/core.js | 6 ++++++ src/wlxml/wlxml.js | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/editor/plugins/core/core.js b/src/editor/plugins/core/core.js index c2c5ffa..0221ed0 100644 --- a/src/editor/plugins/core/core.js +++ b/src/editor/plugins/core/core.js @@ -120,6 +120,8 @@ plugin.documentExtension.textNode.transformations = { parent.contents().some(function(n) { return move(n, newNode); }); + // span can't be the last node + newNode.append({'text': ''}); if(newNodes.second.contents()[0].getText().length === 0) { var textNode = newNodes.second.contents()[0]; newNodes.second.detach(); @@ -521,6 +523,10 @@ var createWrapTextAction = function(createParams) { offsetEnd: params.fragment.endOffset, textNodeIdx: [params.fragment.startNode.getIndex(), params.fragment.endNode.getIndex()] }); + if(wrapper.next() === null) { + // span can't be the last node + parent.append({text: ''}); + } lastTextNode = wrapper.getLastTextNode(); if(lastTextNode) { diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js index d05eb64..ce0ac0a 100644 --- a/src/wlxml/wlxml.js +++ b/src/wlxml/wlxml.js @@ -239,7 +239,9 @@ $.extend(WLXMLDocument.prototype, { }); nativeNode.normalize(); $(nativeNode).find('*').each(function() { - if (this.childNodes.length === 0) { + var emptyNode = this.childNodes.length === 0; + var endsWithSpan = !emptyNode && this.childNodes[this.childNodes.length - 1].nodeName.toLowerCase() === 'span'; + if(emptyNode || endsWithSpan) { var fakeTextNode = window.document.createTextNode(""); this.appendChild(fakeTextNode); } @@ -295,7 +297,7 @@ $.extend(WLXMLDocument.prototype, { } } - if(!text.transformed && !onlyChild) { + if(!text.transformed && !(el.is(':only-child') || (el.is(':last-child') && hasSpanBefore))) { addInfo(text.original, 'below'); el.remove(); return true; // continue -- 2.20.1