X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/f291310bd26717330272d1be30e4a5b935220ce8..29a87f7c5b2ddddf7c5c738c4747ffd6f6bb35bb:/src/smartxml/core.js

diff --git a/src/smartxml/core.js b/src/smartxml/core.js
index a2d39a6..419b175 100644
--- a/src/smartxml/core.js
+++ b/src/smartxml/core.js
@@ -106,7 +106,7 @@ var elementNodeTransformations = {
 
     detach: function() {
         var next;
-        if(this.parent() && this.isSurroundedByTextElements()) {
+        if(this.parent() && this.isSurroundedByTextNodes()) {
             next = this.next();
             this.prev().appendText(next.getText());
             next.detach();
@@ -115,26 +115,21 @@ var elementNodeTransformations = {
     },
 
     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) {
-            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);