X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/df1aaa5ae8434788bb67662782fe7e5324ac9786..226e74a984c6e5652bc7c6f7cb97f2f27eaba6b1:/src/smartxml/core.js?ds=sidebyside

diff --git a/src/smartxml/core.js b/src/smartxml/core.js
index 44be8d6..665f9d5 100644
--- a/src/smartxml/core.js
+++ b/src/smartxml/core.js
@@ -433,7 +433,7 @@ var documentTransformations = {
         return insertion.ofNode;
     },
     deleteText: function(params) {
-        var ptr, prev, next, toDetach, middle, text;
+        var ptr, next, toDetach, middle, text;
 
         if(params.from.node.sameNode(params.to.node)) {
             ptr = params.from.node;
@@ -442,12 +442,20 @@ var documentTransformations = {
             return;
         }
 
+        // Both edge text nodes need to be edited before anything else happen in case that
+        // they get merged when detaching content between them.
+        params.from.node.setText(params.from.node.getText().substr(0, params.from.offset));
+        params.to.node.setText(params.to.node.getText().substr(params.to.offset));
+
         ptr = params.from.node;
-        ptr.setText(ptr.getText().substr(0, params.from.offset));
         next = ptr.next();
+
         while(next || ptr.parent()) {
             if(next) {
-                if(next.sameNode(params.to.node) || (next.nodeType === Node.ELEMENT_NODE && next.containsNode(params.to.node))) {
+                if(next.sameNode(params.to.node)) {
+                    return;
+                }
+                else if(next.nodeType === Node.ELEMENT_NODE && next.containsNode(params.to.node)) {
                     middle = next;
                     break;
                 } else {
@@ -461,20 +469,19 @@ var documentTransformations = {
             }
         }
 
-        ptr = params.to.node;
-        ptr.setText(ptr.getText().substr(params.to.offset));
-        prev = ptr.prev();
-        while(prev || ptr.parent()) {
-            if(ptr.sameNode(middle)) {
-                break;
-            }
-            if(prev) {
-                toDetach = prev;
-                prev = prev.prev();
-                toDetach.detach();
+        if(!this.containsNode(params.to.node)) {
+            // The end node was merged during detaching nodes above - there is nothing more left to do.
+            return;
+        }
+
+        ptr = middle.contents()[0];
+        while(ptr && !ptr.sameNode(params.to.node)) {
+            if(ptr.nodeType === Node.ELEMENT_NODE && ptr.containsNode(params.to.node)) {
+                ptr = ptr.contents()[0];
+                continue;
             } else {
-                ptr = ptr.parent();
-                prev = ptr.prev();
+                ptr = ptr.next();
+                ptr.prev().detach();
             }
         }
     }