X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/d13ac0186f86e208dc64e43b773576c5a224ad07..61dfc642406900ea1d4b2751925329cd69a36a87:/src/wlxml/wlxml.js

diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js
index d05eb64..a5a87d2 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);
             }
@@ -253,9 +255,7 @@ $.extend(WLXMLDocument.prototype, {
                     elParent = el.parent(),
                     hasSpanParent = elParent.prop('tagName') === 'SPAN',
                     hasSpanBefore = el.prev().length && $(el.prev()).prop('tagName') === 'SPAN',
-                    hasSpanAfter = el.next().length && $(el.next()).prop('tagName') === 'SPAN',
-                    onlyChild = el.is(':only-child');
-
+                    hasSpanAfter = el.next().length && $(el.next()).prop('tagName') === 'SPAN';
 
                 var addInfo = function(toAdd, where, transformed, original) {
                     var parentContents = elParent.contents(),
@@ -295,7 +295,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