smartxml: fix - handle creation of an empty text node

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

diff --git a/src/smartxml/smartxml.js b/src/smartxml/smartxml.js
index a357977..0a1a354 100644 (file)
--- a/src/smartxml/smartxml.js
+++ b/src/smartxml/smartxml.js
@@ -36,6 +36,10 @@ $.extend(DocumentNode.prototype, {
         this._$ = $(nativeNode);
     },
 
         this._$ = $(nativeNode);
     },
 

+    isRoot: function() {
+        return this.document.root.sameNode(this);
+    },
+

     detach: function() {
         var parent = this.parent();
         this._$.detach();
     detach: function() {
         var parent = this.parent();
         this._$.detach();


@@ -50,7 +54,7 @@ $.extend(DocumentNode.prototype, {
     parent: function() {
         var parentNode = this.nativeNode.parentNode;
         if(parentNode && parentNode.nodeType === Node.ELEMENT_NODE) {
     parent: function() {
         var parentNode = this.nativeNode.parentNode;
         if(parentNode && parentNode.nodeType === Node.ELEMENT_NODE) {

-            return this.document.createElementNode(parentNode);
+            return this.document.createDocumentNode(parentNode);

         }
         return null;
     },
         }
         return null;
     },


@@ -64,6 +68,26 @@ $.extend(DocumentNode.prototype, {
         return parents;
     },
 
         return parents;
     },
 

+    prev: function() {
+        var myIdx = this.getIndex();
+        return myIdx > 0 ? this.parent().contents()[myIdx-1] : null;
+    },
+
+    next: function() {
+        if(this.isRoot()) {
+            return null;
+        }
+        var myIdx = this.getIndex(),
+            parentContents = this.parent().contents();
+        return myIdx < parentContents.length - 1 ? parentContents[myIdx+1] : null;
+    },
+
+    isSurroundedByTextElements: function() {
+        var prev = this.prev(),
+            next = this.next();
+        return prev && (prev.nodeType === Node.TEXT_NODE) && next && (next.nodeType === Node.TEXT_NODE);
+    },
+

     after: INSERTION(function(nativeNode) {
         return this._$.after(nativeNode);
     }),
     after: INSERTION(function(nativeNode) {
         return this._$.after(nativeNode);
     }),


@@ -73,18 +97,35 @@ $.extend(DocumentNode.prototype, {
     }),
 
     wrapWith: function(node) {
     }),
 
     wrapWith: function(node) {

-        node = node instanceof ElementNode ? node : this.document.createElementNode(node);
-
+        var insertion = this.getNodeInsertion(node);

         if(this.parent()) {
         if(this.parent()) {

-            this.before(node);
+            this.before(insertion.ofNode);
+        }
+        insertion.ofNode.append(this);
+        return insertion.ofNode;
+    },
+
+    /**
+    * Removes parent of a node if node has no siblings.
+    */
+    unwrap: function() {
+        if(this.isRoot()) {
+            return;
+        }
+        var parent = this.parent(),
+            grandParent;
+        if(parent.contents().length === 1) {
+            grandParent = parent.parent();
+            parent.unwrapContent();
+            return grandParent;

         }
         }

-        node.append(this);
-        return node;

     },
 
     triggerChangeEvent: function(type, metaData) {
         var event = new events.ChangeEvent(type, $.extend({node: this}, metaData || {}));
     },
 
     triggerChangeEvent: function(type, metaData) {
         var event = new events.ChangeEvent(type, $.extend({node: this}, metaData || {}));

-        this.document.trigger('change', event);
+        if(type === 'nodeDetached' || this.document.containsNode(event.meta.node)) {
+            this.document.trigger('change', event);
+        }

     },
     
     getNodeInsertion: function(node) {
     },
     
     getNodeInsertion: function(node) {


@@ -93,13 +134,16 @@ $.extend(DocumentNode.prototype, {
             insertion.ofNode = node;
             insertion.insertsNew = !this.document.containsNode(node);
         } else {
             insertion.ofNode = node;
             insertion.insertsNew = !this.document.containsNode(node);
         } else {

-          insertion.ofNode = this.document.createElementNode(node);
+          insertion.ofNode = this.document.createDocumentNode(node);

           insertion.insertsNew = true;
         }
         return insertion;
     },
 
     getIndex: function() {
           insertion.insertsNew = true;
         }
         return insertion;
     },
 
     getIndex: function() {

+        if(this.isRoot()) {
+            return 0;
+        }

         return this.parent().indexOf(this);
     }
 });
         return this.parent().indexOf(this);
     }
 });


@@ -112,6 +156,16 @@ ElementNode.prototype = Object.create(DocumentNode.prototype);
 $.extend(ElementNode.prototype, {
     nodeType: Node.ELEMENT_NODE,
 
 $.extend(ElementNode.prototype, {
     nodeType: Node.ELEMENT_NODE,
 

+    detach: function() {
+        var next;
+        if(parent && this.isSurroundedByTextElements()) {
+            next = this.next();
+            this.prev().appendText(next.getText());
+            next.detach();
+        }
+        return DocumentNode.prototype.detach.call(this);
+    },
+

     setData: function(key, value) {
         if(value !== undefined) {
             this._$.data(key, value);
     setData: function(key, value) {
         if(value !== undefined) {
             this._$.data(key, value);


@@ -136,12 +190,7 @@ $.extend(ElementNode.prototype, {
         var toret = [],
             document = this.document;
         this._$.contents().each(function() {
         var toret = [],
             document = this.document;
         this._$.contents().each(function() {

-            if(this.nodeType === Node.ELEMENT_NODE) {
-                toret.push(document.createElementNode(this));
-            }
-            else if(this.nodeType === Node.TEXT_NODE) {
-                toret.push(document.createTextNode(this));
-            }
+            toret.push(document.createDocumentNode(this));

         });
         return toret;
     },
         });
         return toret;
     },


@@ -151,7 +200,7 @@ $.extend(ElementNode.prototype, {
     },
 
     setTag: function(tagName) {
     },
 
     setTag: function(tagName) {

-        var node = this.document.createElementNode({tagName: tagName}),
+        var node = this.document.createDocumentNode({tagName: tagName}),

             oldTagName = this.getTagName(),
             myContents = this._$.contents();
 
             oldTagName = this.getTagName(),
             myContents = this._$.contents();
 


@@ -203,18 +252,20 @@ $.extend(ElementNode.prototype, {
             return;
         }
 
             return;
         }
 

-        var parentContents = parent.contents(),
-            myContents = this.contents(),
+        var myContents = this.contents(),

             myIdx = parent.indexOf(this);
 
             myIdx = parent.indexOf(this);
 

+

         if(myContents.length === 0) {
             return this.detach();
         }
 
         if(myContents.length === 0) {
             return this.detach();
         }
 

-        var moveLeftRange, moveRightRange, leftMerged;
+        var prev = this.prev(),
+            next = this.next(),
+            moveLeftRange, moveRightRange, leftMerged;

 
 

-        if(myIdx > 0 && (parentContents[myIdx-1].nodeType === TEXT_NODE) && (myContents[0].nodeType === TEXT_NODE)) {
-            parentContents[myIdx-1].appendText(myContents[0].getText());
+        if(prev && (prev.nodeType === TEXT_NODE) && (myContents[0].nodeType === TEXT_NODE)) {
+            prev.appendText(myContents[0].getText());

             myContents[0].detach();
             moveLeftRange = true;
             leftMerged = true;
             myContents[0].detach();
             moveLeftRange = true;
             leftMerged = true;


@@ -223,9 +274,10 @@ $.extend(ElementNode.prototype, {
         }
 
         if(!(leftMerged && myContents.length === 1)) {
         }
 
         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();
+            var lastContents = _.last(myContents);
+            if(next && (next.nodeType === TEXT_NODE) && (lastContents.nodeType === TEXT_NODE)) {
+                next.prependText(lastContents.getText());
+                lastContents.detach();

                 moveRightRange = true;
             }
         }
                 moveRightRange = true;
             }
         }


@@ -318,9 +370,9 @@ $.extend(Document.prototype, Backbone.Events, {
     ElementNodeFactory: ElementNode,
     TextNodeFactory: TextNode,
 
     ElementNodeFactory: ElementNode,
     TextNodeFactory: TextNode,
 

-    createElementNode: function(from) {
-        if(!(from instanceof HTMLElement)) {
-            if(from.text) {
+    createDocumentNode: function(from) {
+        if(!(from instanceof Node)) {
+            if(from.text !== undefined) {

                 from = document.createTextNode(from.text);
             } else {
                 var node = $('<' + from.tagName + '>');
                 from = document.createTextNode(from.text);
             } else {
                 var node = $('<' + from.tagName + '>');


@@ -341,10 +393,6 @@ $.extend(Document.prototype, Backbone.Events, {
         return new Factory(from, this);
     },
 
         return new Factory(from, this);
     },
 

-    createTextNode: function(nativeNode) {
-        return new this.TextNodeFactory(nativeNode, this);
-    },
-

     loadXML: function(xml, options) {
         options = options || {};
         defineDocumentProperties(this, $(parseXML(xml)));
     loadXML: function(xml, options) {
         options = options || {};
         defineDocumentProperties(this, $(parseXML(xml)));


@@ -358,7 +406,7 @@ $.extend(Document.prototype, Backbone.Events, {
     },
 
     containsNode: function(node) {
     },
 
     containsNode: function(node) {

-        return node._$.parents().index(this.root._$) !== -1;
+        return this.root && (node.nativeNode === this.root.nativeNode || node._$.parents().index(this.root._$) !== -1);

     },
 
     wrapNodes: function(params) {
     },
 
     wrapNodes: function(params) {


@@ -368,7 +416,7 @@ $.extend(Document.prototype, Backbone.Events, {
 
         var parent = params.element1.parent(),
             parentContents = parent.contents(),
 
         var parent = params.element1.parent(),
             parentContents = parent.contents(),

-            wrapper = this.createElementNode({
+            wrapper = this.createDocumentNode({

                 tagName: params._with.tagName,
                 attrs: params._with.attrs}),
             idx1 = parent.indexOf(params.element1),
                 tagName: params._with.tagName,
                 attrs: params._with.attrs}),
             idx1 = parent.indexOf(params.element1),


@@ -438,7 +486,7 @@ $.extend(Document.prototype, Backbone.Events, {
             throw new Error('Wrapping text in non-sibling text nodes not supported.');
         }
         
             throw new Error('Wrapping text in non-sibling text nodes not supported.');
         }
         

-        var wrapperElement = this.createElementNode({tagName: params._with.tagName, attrs: params._with.attrs});
+        var wrapperElement = this.createDocumentNode({tagName: params._with.tagName, attrs: params._with.attrs});

         textNode1.after(wrapperElement);
         textNode1.detach();
         
         textNode1.after(wrapperElement);
         textNode1.detach();
         


@@ -474,7 +522,7 @@ $.extend(Document.prototype, Backbone.Events, {
 
 var defineDocumentProperties = function(doc, $document) {
     Object.defineProperty(doc, 'root', {get: function() {
 
 var defineDocumentProperties = function(doc, $document) {
     Object.defineProperty(doc, 'root', {get: function() {

-        return doc.createElementNode($document[0]);
+        return doc.createDocumentNode($document[0]);

     }, configurable: true});
     Object.defineProperty(doc, 'dom', {get: function() {
         return $document[0];
     }, configurable: true});
     Object.defineProperty(doc, 'dom', {get: function() {
         return $document[0];