make sure to run all tests

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

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index f6fae64..43e3041 100644 (file)
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -5,34 +5,58 @@ 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];

-}
+};

 
 var Document = function(nativeNode) {
     var $document = $(nativeNode);
 
 
 
 var Document = function(nativeNode) {
     var $document = $(nativeNode);
 
 

-    Object.defineProperty(this, 'root', {get: function() { return new ElementNode($document[0])}}); 
-}
+    Object.defineProperty(this, 'root', {get: function() { return new ElementNode($document[0]);}});
+};

 
 
 
 

-var ElementNode = function(nativeNode) {
+var DocumentNode = function(nativeNode) {

     this.nativeNode = nativeNode;
     this._$ = $(nativeNode);
 };
 
     this.nativeNode = nativeNode;
     this._$ = $(nativeNode);
 };
 

-$.extend(ElementNode.prototype, {
+$.extend(DocumentNode.prototype, {
+    detach: function() { this._$.detach(); },
+
+    sameNode: function(otherNode) {
+        return this.nativeNode === otherNode.nativeNode;
+    },
+
+    parent: function() {
+        return this.nativeNode.parentNode ? new ElementNode(this.nativeNode.parentNode) : null;
+    },
+
+    before: function(node) {
+        this._$.before(node.nativeNode);
+    },
+
+    wrapWith: function(node) {
+        if(this.parent())
+            this.before(node);
+        node.append(this);
+    },
+});
+
+var ElementNode = function(nativeNode) {
+    DocumentNode.apply(this, arguments);
+};
+
+$.extend(ElementNode.prototype, DocumentNode.prototype, {

     nodeType: Node.ELEMENT_NODE,
 
     getTagName: function() {
         return this.nativeNode.tagName.toLowerCase();
     },
 
     nodeType: Node.ELEMENT_NODE,
 
     getTagName: function() {
         return this.nativeNode.tagName.toLowerCase();
     },
 

-    append: function(documentNode) {
-        this._$.append(documentNode.nativeNode);
-    },
-

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


@@ -44,21 +68,87 @@ $.extend(ElementNode.prototype, {
         return toret;
     },
 
         return toret;
     },
 

+    indexOf: function(node) {
+        return this._$.contents().index(node._$);
+    },

 
 

-    sameNode: function(otherNode) {
-        return this.nativeNode === otherNode.nativeNode;
+    getAttr: function(name) {
+        return this._$.attr(name);
+    },
+
+    setAttr: function(name, value) {
+        this._$.attr(name, value);
+    },
+
+    append: function(documentNode) {
+        this._$.append(documentNode.nativeNode);
+    },
+
+    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)]
+        };

     }
 
 });
 
 var TextNode = function(nativeNode) {
     }
 
 });
 
 var TextNode = function(nativeNode) {

-    this.nativeNode = nativeNode;
-    this._$ = $(nativeNode);
-}
+    DocumentNode.apply(this, arguments);
+};
+
+$.extend(TextNode.prototype, DocumentNode.prototype, {
+    nodeType: Node.TEXT_NODE,

 
 

-$.extend(TextNode.prototype, {
-    nodeType: Node.TEXT_NODE
-})
+    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;
+    }
+});

 
 
 return {
 
 
 return {