From: Aleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Fri, 14 Feb 2014 14:43:45 +0000 (+0100)
Subject: smartxml: fix wrapping root node
X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/f291310bd26717330272d1be30e4a5b935220ce8?ds=sidebyside;hp=-c

smartxml: fix wrapping root node
---

f291310bd26717330272d1be30e4a5b935220ce8
diff --git a/src/smartxml/core.js b/src/smartxml/core.js
index ba612b4..a2d39a6 100644
--- a/src/smartxml/core.js
+++ b/src/smartxml/core.js
@@ -77,8 +77,9 @@ var documentNodeTransformations = {
 
     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;
diff --git a/src/smartxml/smartxml.test.js b/src/smartxml/smartxml.test.js
index b152d26..491c586 100644
--- a/src/smartxml/smartxml.test.js
+++ b/src/smartxml/smartxml.test.js
@@ -529,12 +529,33 @@ describe('smartxml', function() {
             });
         });
 
-        it('wraps element node with another element node', function() {
+        it('wraps root element node with another element node', function() {
             var node = elementNodeFromXML('<div></div>'),
                 wrapper = elementNodeFromXML('<wrapper></wrapper>');
 
             node.wrapWith(wrapper);
             expect(node.parent().sameNode(wrapper)).to.be.true;
+            expect(node.document.root.sameNode(wrapper)).to.be.true;
+        });
+
+        it('wraps element node with another element node', function() {
+            var doc = getDocumentFromXML('<section><div></div></section>'),
+                div = doc.root.contents()[0];
+
+            var wrapper = div.wrapWith({tagName: 'wrapper'});
+            expect(wrapper.sameNode(doc.root.contents()[0])).to.equal(true, '1');
+            expect(div.parent().sameNode(wrapper)).to.equal(true, '2');
+            expect(wrapper.contents()[0].sameNode(div)).to.equal(true, '3');
+        });
+
+        it('wraps element outside of document tree', function() {
+            var doc = getDocumentFromXML('<section><div></div></section>'),
+                node = doc.createDocumentNode({tagName: 'node'});
+
+            node.wrapWith({tagName: 'wrapper'});
+            expect(node.parent().getTagName()).to.equal('wrapper');
+            expect(node.parent().contents()[0].sameNode(node)).to.be.true;
+            expect(doc.root.getTagName()).to.equal('section');
         });
 
         it('unwraps element node contents', function() {