editor: canvas fix

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

diff --git a/src/smartxml/core.js b/src/smartxml/core.js
index ec2c643..419b175 100644 (file)
--- a/src/smartxml/core.js
+++ b/src/smartxml/core.js
@@ -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;


@@ -98,7 +106,7 @@ var elementNodeTransformations = {
 
     detach: function() {
         var next;
 
     detach: function() {
         var next;

-        if(this.parent() && this.isSurroundedByTextElements()) {
+        if(this.parent() && this.isSurroundedByTextNodes()) {

             next = this.next();
             this.prev().appendText(next.getText());
             next.detach();
             next = this.next();
             this.prev().appendText(next.getText());
             next.detach();


@@ -107,26 +115,21 @@ var elementNodeTransformations = {
     },
 
     setTag: function(tagName) {
     },
 
     setTag: function(tagName) {

-        var node = this.document.createDocumentNode({tagName: tagName}),
-            oldTagName = this.getTagName(),
-            myContents = this._$.contents();
+        var node = this.document.createDocumentNode({tagName: tagName});

 
         this.getAttrs().forEach(function(attribute) {
 
         this.getAttrs().forEach(function(attribute) {

-            node.setAttr(attribute.name, attribute.value, true);
+            node.setAttr(attribute.name, attribute.value);

         });
         });

-        node.setData(this.getData());

 
 

-        if(this.sameNode(this.document.root)) {
-            this.document._defineDocumentProperties(node._$);
-        }
+        this.contents().forEach(function(child) {
+            node.append(child);
+        });

 
 

-        /* TODO: This invalidates old references to this node. Caching instances on nodes would fix this. */
-        this._$.replaceWith(node._$);
-        this._setNativeNode(node._$[0]);
-        this._$.append(myContents);
-        this.triggerChangeEvent('nodeTagChange', {oldTagName: oldTagName, newTagName: this.getTagName()});
-    },
+        node.setData(this.getData());

 
 

+        this.replaceWith(node);
+        return node;
+    },

 
     setAttr: function(name, value, silent) {
         var oldVal = this.getAttr(name);
 
     setAttr: function(name, value, silent) {
         var oldVal = this.getAttr(name);