empty text nodes after spans

[fnpeditor.git] / src / editor / plugins / core / core.js

diff --git a/src/editor/plugins/core/core.js b/src/editor/plugins/core/core.js
index c2c5ffa..0221ed0 100644 (file)
--- 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);
                 });
                 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();
                 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()]
                             });
                                 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) {
                                 
                             lastTextNode = wrapper.getLastTextNode();
                             if(lastTextNode) {