editor: refactoring - move dialog view implementation out of data module

[fnpeditor.git] / src / smartxml / core.js

diff --git a/src/smartxml/core.js b/src/smartxml/core.js
index f940ccc..a2d39a6 100644 (file)
--- a/src/smartxml/core.js
+++ b/src/smartxml/core.js
@@ -13,7 +13,7 @@ var INSERTION = function(implementation) {
             nodeParent,
             returned;
         options = options || {};
             nodeParent,
             returned;
         options = options || {};

-        if(!(this.document.containsNode(this))) {
+        if(!(this.document.containsNode(this)) || !insertion.isNew) {

             nodeParent = insertion.ofNode.parent();
         }
         returned = implementation.call(this, insertion.ofNode);
             nodeParent = insertion.ofNode.parent();
         }
         returned = implementation.call(this, insertion.ofNode);


@@ -32,6 +32,10 @@ var documentNodeTransformations = {
         this._$.detach();
         if(existed) {
             this.triggerChangeEvent('nodeDetached', {parent: parent});
         this._$.detach();
         if(existed) {
             this.triggerChangeEvent('nodeDetached', {parent: parent});

+            if(!parent) {
+                // This was the root of the document
+                this.document._defineDocumentProperties(null);
+            }

         }
         return this;
     },
         }
         return this;
     },


@@ -41,9 +45,12 @@ var documentNodeTransformations = {
         if(this.isRoot()) {
             return this.document.replaceRoot(node);
         }
         if(this.isRoot()) {
             return this.document.replaceRoot(node);
         }

-        toret = this.after(node);
-        this.detach();
-        return toret;
+        if(this.parent()) {
+            toret = this.after(node);
+            this.detach();
+            return toret;
+        }
+        throw new Error('Cannot replace node without a parent.');

     },
 
     after: INSERTION(function(node) {
     },
 
     after: INSERTION(function(node) {


@@ -70,8 +77,9 @@ var documentNodeTransformations = {
 
     wrapWith: function(node) {
         var insertion = this.getNodeInsertion(node);
 
     wrapWith: function(node) {
         var insertion = this.getNodeInsertion(node);

-        if(this.parent()) {
-            this.before(insertion.ofNode);
+
+        if(this.parent() || this.isRoot()) {
+            this.replaceWith(insertion.ofNode);

         }
         insertion.ofNode.append(this);
         return insertion.ofNode;
         }
         insertion.ofNode.append(this);
         return insertion.ofNode;


@@ -433,7 +441,7 @@ var documentTransformations = {
         return insertion.ofNode;
     },
     deleteText: function(params) {
         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;
 
         if(params.from.node.sameNode(params.to.node)) {
             ptr = params.from.node;


@@ -452,7 +460,10 @@ var documentTransformations = {
 
         while(next || ptr.parent()) {
             if(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 {
                     middle = next;
                     break;
                 } else {


@@ -466,24 +477,19 @@ var documentTransformations = {
             }
         }
 
             }
         }
 

-        ptr = params.to.node;
-
-        if(!this.containsNode(ptr)) {
+        if(!this.containsNode(params.to.node)) {

             // The end node was merged during detaching nodes above - there is nothing more left to do.
             return;
         }
             // The end node was merged during detaching nodes above - there is nothing more left to do.
             return;
         }

-        prev = ptr.prev();
-        while(prev || ptr.parent()) {
-            if(ptr.sameNode(middle)) {
-                break;
-            }
-            if(prev) {
-                toDetach = prev;
-                prev = prev.prev();
-                toDetach.detach();
+
+        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 {
             } else {

-                ptr = ptr.parent();
-                prev = ptr.prev();
+                ptr = ptr.next();
+                ptr.prev().detach();

             }
         }
     }
             }
         }
     }