Fixing xml output - entities

[fnpeditor.git] / modules / documentCanvas / canvas / documentElement.js

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index f5a022b..29b07df 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -122,6 +122,7 @@ $.extend(DocumentNodeElement, {
                 dom.attr('wlxml-meta-'+key, params.meta[key]);
             });
         }
+        dom.data('other-attrs', params.others);
         return dom;
     },
 
@@ -147,6 +148,7 @@ var manipulate = function(e, params, action) {
 
 DocumentNodeElement.prototype = new DocumentElement();
 
+
 $.extend(DocumentNodeElement.prototype, {
     data: function() {
         var dom = this.dom(),
@@ -156,33 +158,73 @@ $.extend(DocumentNodeElement.prototype, {
         return dom.data.apply(dom, arguments);
     },
     toXML: function(level) {
-        var node = $('<' + this.getWlxmlTag() + '>'),
-            toret = $('<div>');
+        var node = $('<' + this.getWlxmlTag() + '>');
+
         if(this.getWlxmlClass())
             node.attr('class', this.getWlxmlClass());
         var meta = this.getWlxmlMetaAttrs();
         meta.forEach(function(attr) {
-            node.attr('meta-' + attr.name, attr.value);
+            if(attr.value)
+                node.attr('meta-' + attr.name, attr.value);
         });
+        _.keys(this.data('other-attrs') || {}).forEach(function(key) {
+            node.attr(key, this.data('other-attrs')[key]);
+        }, this);
 
-        if(this.data('orig-before') !== undefined) {
-            toret.append(document.createTextNode(this.data('orig-before')));
-        } else if(level && this.getWlxmlTag() !== 'span') {
-            toret.append('\n' + (new Array(level * 2 + 1)).join(' '));
-        }
-        if(this.data('orig-append') !== undefined) {
-            node.append(this.data('orig-append'));
-            //toret = toret.prepend(document.createTextNode(this.data('orig-prepend')));
-        } else if(this.getWlxmlTag() !== 'span'){
-            node.append('\n' + (new Array(level * 2 + 1)).join(' '));
+        var addFormatting = function() {
+            var toret = $('<div>');
+
+            if(this.data('orig-before') && this.data('orig-before').length) {
+                this.data('orig-before').forEach(function(toAdd) {
+                    if(toAdd)
+                        toret.prepend(document.createTextNode(toAdd));
+                });
+            } else if(level && this.getWlxmlTag() !== 'span') {
+                toret.append('\n' + (new Array(level * 2 + 1)).join(' '));
+            }
+            if(this.data('orig-append') && this.data('orig-append').length) {
+                this.data('orig-append').forEach(function(toAdd) {
+                    if(toAdd)
+                        node.prepend(toAdd);
+                });
+            } else if(this.getWlxmlTag() !== 'span'){
+                node.append('\n' + (new Array(level * 2 + 1)).join(' '));
+            }
+            toret.append(node);
+            return toret.contents();
+        }.bind(this);
+
+        var parts = addFormatting(node);
+        
+        var children = this.children(),
+            childParts,
+            prevChildParts;
+
+        var containsPrefixAndSuffix = function(idx) {
+            if(idx === children.length - 1 && node.contents().length === 2)
+                return true;
+            if(prevChildParts && prevChildParts.length > 1 && prevChildParts[0].nodeType === Node.TEXT_NODE && prevChildParts[1].nodeType === Node.TEXT_NODE)
+                return true;
+            return false;
         }
 
-        toret.append(node);
-        return toret.contents();
+        for(var i = children.length - 1; i >= 0; i--) {
+            childParts = children[i].toXML(level + 1);
+            if(typeof childParts === 'string')
+                childParts = [document.createTextNode(childParts)];
+
+            if(containsPrefixAndSuffix(i) && children[i] instanceof DocumentTextElement) {
+                $(node.contents()[0]).after(childParts);
+            } else {
+                node.prepend(childParts);
+            }
+            prevChildParts = childParts;
+        }
+        return parts;
     },
     append: function(params) {
         if(params.tag !== 'span')
-            this.data('orig-append', undefined);
+            this.data('orig-append', []);
         return manipulate(this, params, 'append');
     },
     before: function(params) {
@@ -294,7 +336,7 @@ $.extend(DocumentTextElement, {
 DocumentTextElement.prototype = new DocumentElement();
 
 $.extend(DocumentTextElement.prototype, {
-    toXML: function() {
+    toXML: function(parent) {
         return this.getText();
     },
     _setupDOMHandler: function(htmlElement) {