unwrap contents

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index f6fae64..8eeca1a 100644 (file)
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -5,6 +5,8 @@ define([
 'use strict';
 
 
 'use strict';
 
 

+var TEXT_NODE = Node.TEXT_NODE, ELEMENT_NODE = Node.ELEMENT_NODE;
+

 var parseXML = function(xml) {
     return $(xml)[0];
 }
 var parseXML = function(xml) {
     return $(xml)[0];
 }


@@ -33,6 +35,10 @@ $.extend(ElementNode.prototype, {
         this._$.append(documentNode.nativeNode);
     },
 
         this._$.append(documentNode.nativeNode);
     },
 

+    before: function(node) {
+        this._$.before(node.nativeNode);
+    },
+

     contents: function() {
         var toret = [];
         this._$.contents().each(function() {
     contents: function() {
         var toret = [];
         this._$.contents().each(function() {


@@ -47,6 +53,62 @@ $.extend(ElementNode.prototype, {
 
     sameNode: function(otherNode) {
         return this.nativeNode === otherNode.nativeNode;
 
     sameNode: function(otherNode) {
         return this.nativeNode === otherNode.nativeNode;

+    },
+
+    indexOf: function(node) {
+        return this._$.contents().index(node._$);
+    },
+
+    detach: function() {
+        this._$.detach();
+    },
+
+    parent: function() {
+        return new ElementNode(this._$.parent());
+    },
+
+    unwrapContent: function() {
+        var parent = this.parent();
+        if(!parent)
+            return;
+
+        var parentContents = parent.contents(),
+            myContents = this.contents(),
+            myIdx = parent.indexOf(this);
+
+        if(myContents.length === 0)
+            return this.detach();
+
+        var moveLeftRange, moveRightRange, leftMerged;
+
+        if(myIdx > 0 && (parentContents[myIdx-1].nodeType === TEXT_NODE) && (myContents[0].nodeType === TEXT_NODE)) {
+            parentContents[myIdx-1].appendText(myContents[0].getText());
+            myContents[0].detach();
+            moveLeftRange = true;
+            leftMerged = true;
+        } else {
+            leftMerged = false;
+        }
+
+        if(!(leftMerged && myContents.length === 1)) {
+            if(myIdx < parentContents.length - 1 && (parentContents[myIdx+1].nodeType === TEXT_NODE) && (myContents[myContents.length-1].nodeType === TEXT_NODE)) {
+                parentContents[myIdx+1].prependText(myContents[myContents.length-1].getText());
+                myContents[myContents.length-1].detach();
+                moveRightRange = true;
+            }
+        }
+
+        var childrenLength = this.contents().length;
+        this.contents().forEach(function(child) {
+            this.before(child);
+        }.bind(this));
+
+        this.detach();
+
+        return {
+            element1: parent.contents()[myIdx + (moveLeftRange ? -1 : 0)],
+            element2: parent.contents()[myIdx + childrenLength-1 + (moveRightRange ? 1 : 0)]
+        };

     }
 
 });
     }
 
 });


@@ -57,7 +119,23 @@ var TextNode = function(nativeNode) {
 }
 
 $.extend(TextNode.prototype, {
 }
 
 $.extend(TextNode.prototype, {

-    nodeType: Node.TEXT_NODE
+    nodeType: Node.TEXT_NODE,
+
+    detach: function() {
+        this._$.detach();
+    },
+
+    getText: function() {
+        return this.nativeNode.data;
+    },
+
+    appendText: function(text) {
+        this.nativeNode.data = this.nativeNode.data + text;
+    },
+
+    prependText: function(text) {
+        this.nativeNode.data = text + this.nativeNode.data;
+    }

 })
 
 
 })
 
 

diff --git a/src/smartxml/smartxml.test.js b/src/smartxml/smartxml.test.js
index 6d39fbd..2198795 100644 (file)
--- a/src/smartxml/smartxml.test.js
+++ b/src/smartxml/smartxml.test.js
@@ -52,6 +52,18 @@ describe.only('smartxml', function() {
             expect(node1.contents()[0].sameNode(node2)).to.be.true;
         });
 
             expect(node1.contents()[0].sameNode(node2)).to.be.true;
         });
 

+        it('unwraps element node contents', function() {
+            var node = elementNodeFromXML('<div>Alice <div>has <span>propably</span> a cat</div>!</div>'),
+                outerDiv = node.contents()[1];
+            
+            outerDiv.unwrapContent();
+
+            expect(node.contents().length).to.equal(3);
+            expect(node.contents()[0].getText()).to.equal('Alice has ');
+            expect(node.contents()[1].getTagName()).to.equal('span');
+            expect(node.contents()[2].getText()).to.equal(' a cat!');
+        });
+

     });
 
 });
     });
 
 });