Output formatting wip: keeping excessive white space at the end of text intact

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

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index 230e987..94b8422 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.attr('wlxml-meta-'+key, params.meta[key]);
             });
         }

+        dom.data('other-attrs', params.others);

         return dom;
     },
 
         return dom;
     },
 


@@ -148,7 +149,45 @@ var manipulate = function(e, params, action) {
 DocumentNodeElement.prototype = new DocumentElement();
 
 $.extend(DocumentNodeElement.prototype, {
 DocumentNodeElement.prototype = new DocumentElement();
 
 $.extend(DocumentNodeElement.prototype, {

+    data: function() {
+        var dom = this.dom(),
+            args = Array.prototype.slice.call(arguments, 0);
+        if(args.length === 2 && args[1] === undefined)
+            return dom.removeData(args[1]);
+        return dom.data.apply(dom, arguments);
+    },
+    toXML: function(level) {
+        var node = $('<' + this.getWlxmlTag() + '>'),
+            toret = $('<div>');
+        if(this.getWlxmlClass())
+            node.attr('class', this.getWlxmlClass());
+        var meta = this.getWlxmlMetaAttrs();
+        meta.forEach(function(attr) {
+            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(' '));
+        }
+
+        toret.append(node);
+        return toret.contents();
+    },

     append: function(params) {
     append: function(params) {

+        if(params.tag !== 'span')
+            this.data('orig-append', undefined);

         return manipulate(this, params, 'append');
     },
     before: function(params) {
         return manipulate(this, params, 'append');
     },
     before: function(params) {


@@ -260,6 +299,9 @@ $.extend(DocumentTextElement, {
 DocumentTextElement.prototype = new DocumentElement();
 
 $.extend(DocumentTextElement.prototype, {
 DocumentTextElement.prototype = new DocumentElement();
 
 $.extend(DocumentTextElement.prototype, {

+    toXML: function() {
+        return this.getText();
+    },

     _setupDOMHandler: function(htmlElement) {
         var $element = $(htmlElement);
         if(htmlElement.nodeType === Node.TEXT_NODE)
     _setupDOMHandler: function(htmlElement) {
         var $element = $(htmlElement);
         if(htmlElement.nodeType === Node.TEXT_NODE)