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 8a50d23..94b8422 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -1,25 +1,66 @@
 define([
 'libs/jquery-1.9.1.min',
 define([
 'libs/jquery-1.9.1.min',

-'libs/underscore-min'
-], function($, _) {
+'libs/underscore-min',
+'modules/documentCanvas/classAttributes'
+], function($, _, classAttributes) {

     
 'use strict';
 
 
     
 'use strict';
 
 

-// DocumentElement represents a node from WLXML document rendered inside Canvas
+// DocumentElement represents a text or an element node from WLXML document rendered inside Canvas

 var DocumentElement = function(htmlElement, canvas) {
     if(arguments.length === 0)
         return;
     this.canvas = canvas;
 var DocumentElement = function(htmlElement, canvas) {
     if(arguments.length === 0)
         return;
     this.canvas = canvas;

-    this.$element = $(htmlElement);
+    this._setupDOMHandler(htmlElement);

 }
 
 }
 

+var elementTypeFromParams = function(params) {
+    return params.text !== undefined ? DocumentTextElement : DocumentNodeElement;
+
+};
+
+$.extend(DocumentElement, {
+    create: function(params, canvas) {
+        return elementTypeFromParams(params).create(params);
+    },
+
+    createDOM: function(params) {
+        return elementTypeFromParams(params).createDOM(params);
+    },
+
+    fromHTMLElement: function(htmlElement, canvas) {
+        var $element = $(htmlElement);
+        if(htmlElement.nodeType === Node.ELEMENT_NODE && $element.attr('wlxml-tag'))
+            return DocumentNodeElement.fromHTMLElement(htmlElement, canvas);
+        if($element.attr('wlxml-text') !== undefined || (htmlElement.nodeType === Node.TEXT_NODE && $element.parent().attr('wlxml-text') !== undefined))
+            return DocumentTextElement.fromHTMLElement(htmlElement, canvas);
+        return undefined;
+    }
+});
+

 $.extend(DocumentElement.prototype, {
 $.extend(DocumentElement.prototype, {

+    _setupDOMHandler: function(htmlElement) {
+        this.$element = $(htmlElement);
+    },

     dom: function() {
         return this.$element;
     },
     parent: function() {
     dom: function() {
         return this.$element;
     },
     parent: function() {

-        return documentElementFromHTMLElement(this.$element.parent()[0], this.canvas);
+        var parents = this.$element.parents('[wlxml-tag]');
+        if(parents.length)
+            return DocumentElement.fromHTMLElement(parents[0], this.canvas);
+        return null;
+    },
+
+    parents: function() {
+        var parents = [],
+            parent = this.parent();
+        while(parent) {
+            parents.push(parent);
+            parent = parent.parent();
+        }
+        return parents;

     },
 
     sameNode: function(other) {
     },
 
     sameNode: function(other) {


@@ -36,42 +77,125 @@ $.extend(DocumentElement.prototype, {
     detach: function() {
         this.dom().detach();
         this.canvas = null;
     detach: function() {
         this.dom().detach();
         this.canvas = null;

+    },
+
+    markAsCurrent: function() {
+        this.canvas.markAsCurrent(this);
+    },
+
+    getVerticallyFirstTextElement: function() {
+        var toret;
+        this.children().some(function(child) {
+            if(!child.isVisible())
+                return false; // continue
+            if(child instanceof DocumentTextElement) {
+                toret = child;
+                return true; // break
+            } else {
+                toret = child.getVerticallyFirstTextElement();
+                if(toret)
+                    return true; // break
+            }
+        });
+        return toret;
+    },
+
+    isVisible: function() {
+        return this instanceof DocumentTextElement || this.getWlxmlTag() !== 'metadata';

     }
 });
 
 
     }
 });
 
 

+// DocumentNodeElement represents an element node from WLXML document rendered inside Canvas

 var DocumentNodeElement = function(htmlElement, canvas) {
     DocumentElement.call(this, htmlElement, canvas);
 };
 
 var DocumentNodeElement = function(htmlElement, canvas) {
     DocumentElement.call(this, htmlElement, canvas);
 };
 

-var DocumentTextElement = function(htmlElement, canvas) {
-    DocumentElement.call(this, htmlElement, canvas);
-};
+$.extend(DocumentNodeElement, {
+    createDOM: function(params) {
+        var dom = $('<div>')
+            .attr('wlxml-tag', params.tag);
+        if(params.klass)
+            dom.attr('wlxml-class', params.klass.replace(/\./g, '-'));
+        if(params.meta) {
+            _.keys(params.meta).forEach(function(key) {
+                dom.attr('wlxml-meta-'+key, params.meta[key]);
+            });
+        }
+        dom.data('other-attrs', params.others);
+        return dom;
+    },

 
 

-DocumentNodeElement.prototype = new DocumentElement();
-DocumentTextElement.prototype = new DocumentElement();
+    create: function(params, canvas) {
+        return this.fromHTMLElement(this.createDOM(params)[0]);
+    },
+
+    fromHTMLElement: function(htmlElement, canvas) {
+        return new this(htmlElement, canvas);
+    }
+});

 
 var manipulate = function(e, params, action) {
 
 var manipulate = function(e, params, action) {

-    var dom;
+    var element;

     if(params instanceof DocumentElement) {
     if(params instanceof DocumentElement) {

-        dom = params.dom()
+        element = params;

     } else {
     } else {

-        dom = DocumentNodeElement.createDOM(params);
+        element = DocumentElement.create(params);

     }
     }

-    e.dom()[action](dom);
-    return documentElementFromHTMLElement(dom);
+    e.dom()[action](element.dom());
+    return element;

 };
 
 };
 

+DocumentNodeElement.prototype = new DocumentElement();
+

 $.extend(DocumentNodeElement.prototype, {
 $.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) {

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

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

-        manipulate(this, params, 'before');
+        return manipulate(this, params, 'before');

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

-        manipulate(this, params, 'after');
+        return manipulate(this, params, 'after');

     },
     children: function() {
         var toret = [];
     },
     children: function() {
         var toret = [];


@@ -82,7 +206,7 @@ $.extend(DocumentNodeElement.prototype, {
         var elementContent = this.dom().contents();
         var element = this;
         elementContent.each(function(idx) {
         var elementContent = this.dom().contents();
         var element = this;
         elementContent.each(function(idx) {

-            var childElement = documentElementFromHTMLElement(this, element.canvas);
+            var childElement = DocumentElement.fromHTMLElement(this, element.canvas);

             if(idx === 0 && elementContent.length > 1 && elementContent[1].nodeType === Node.ELEMENT_NODE && (childElement instanceof DocumentTextElement) && $.trim($(this).text()) === '')
                 return true;
             if(idx > 0 && childElement instanceof DocumentTextElement) {
             if(idx === 0 && elementContent.length > 1 && elementContent[1].nodeType === Node.ELEMENT_NODE && (childElement instanceof DocumentTextElement) && $.trim($(this).text()) === '')
                 return true;
             if(idx > 0 && childElement instanceof DocumentTextElement) {


@@ -113,12 +237,17 @@ $.extend(DocumentNodeElement.prototype, {
     getWlxmlClass: function() {
         var klass = this.dom().attr('wlxml-class');
         if(klass)
     getWlxmlClass: function() {
         var klass = this.dom().attr('wlxml-class');
         if(klass)

-            return klass.replace('-', '.');
+            return klass.replace(/-/g, '.');

         return undefined;
     },
     setWlxmlClass: function(klass) {
         return undefined;
     },
     setWlxmlClass: function(klass) {

+        this.getWlxmlMetaAttrs().forEach(function(attr) {
+            if(!classAttributes.hasMetaAttr(klass, attr.name))
+                this.dom().removeAttr('wlxml-meta-' + attr.name);
+        }, this);
+

         if(klass)
         if(klass)

-            this.dom().attr('wlxml-class', klass);
+            this.dom().attr('wlxml-class', klass.replace(/\./g, '-'));

         else
             this.dom().removeAttr('wlxml-class');
     },
         else
             this.dom().removeAttr('wlxml-class');
     },


@@ -126,30 +255,62 @@ $.extend(DocumentNodeElement.prototype, {
         if(what === 'list' && _.contains(['list-items', 'list-items-enum'], this.dom().attr('wlxml-class')))
             return true;
         return false;
         if(what === 'list' && _.contains(['list-items', 'list-items-enum'], this.dom().attr('wlxml-class')))
             return true;
         return false;

+    },
+
+
+    getWlxmlMetaAttr: function(attr) {
+        return this.dom().attr('wlxml-meta-'+attr);
+    },
+    getWlxmlMetaAttrs: function() {
+        var toret = [];
+        var attrList = classAttributes.getMetaAttrsList(this.getWlxmlClass());
+        attrList.all.forEach(function(attr) {
+            toret.push({name: attr.name, value: this.getWlxmlMetaAttr(attr.name) || ''});
+        }, this);
+        return toret;
+    },
+    setWlxmlMetaAttr: function(attr, value) {
+        this.dom().attr('wlxml-meta-'+attr, value);

     }
 });
 
     }
 });
 

-DocumentNodeElement.createDOM = function(params) {
-    var dom;
-    if(params.text) {
-        dom = $(document.createTextNode(params.text));
-    } else {
-        dom = $('<div>').attr('wlxml-tag', params.tag);
-        if(params.klass)
-            dom.attr('wlxml-class', params.klass);
-    }
-    return dom;
+
+// DocumentNodeElement represents a text node from WLXML document rendered inside Canvas
+var DocumentTextElement = function(htmlElement, canvas) {
+    DocumentElement.call(this, htmlElement, canvas);

 };
 
 };
 

+$.extend(DocumentTextElement, {
+    createDOM: function(params) {
+        return $('<div>')
+            .attr('wlxml-text', '')
+            .text(params.text);
+    },

 
 

-DocumentNodeElement.create = function(params, canvas) {
-    return documentElementFromHTMLElement(DocumentNodeElement.createDOM(params)[0]);
-};
+    create: function(params, canvas) {
+        return this.fromHTMLElement(this.createDOM(params)[0]);
+    },
+
+    fromHTMLElement: function(htmlElement, canvas) {
+        return new this(htmlElement, canvas);
+    }
+});

 
 

+DocumentTextElement.prototype = new DocumentElement();

 
 $.extend(DocumentTextElement.prototype, {
 
 $.extend(DocumentTextElement.prototype, {

+    toXML: function() {
+        return this.getText();
+    },
+    _setupDOMHandler: function(htmlElement) {
+        var $element = $(htmlElement);
+        if(htmlElement.nodeType === Node.TEXT_NODE)
+            this.$element = $element.parent();
+        else
+            this.$element = $element;
+    },

     setText: function(text) {
     setText: function(text) {

-        this.dom()[0].data = text;
+        this.dom().contents()[0].data = text;

     },
     getText: function() {
         return this.dom().text();
     },
     getText: function() {
         return this.dom().text();


@@ -157,30 +318,30 @@ $.extend(DocumentTextElement.prototype, {
     after: function(params) {
         if(params instanceof DocumentTextElement || params.text)
             return false;
     after: function(params) {
         if(params instanceof DocumentTextElement || params.text)
             return false;

-        var dom;
+        var element;

         if(params instanceof DocumentNodeElement) {
         if(params instanceof DocumentNodeElement) {

-            dom = params.dom();
+            element = params;

         } else {
         } else {

-            dom = DocumentNodeElement.createDOM(params);
+            element = DocumentNodeElement.create(params);

         }
         this.dom().wrap('<div>');
         }
         this.dom().wrap('<div>');

-        this.dom().parent().after(dom[0]);
+        this.dom().parent().after(element.dom());

         this.dom().unwrap();
         this.dom().unwrap();

-        return documentElementFromHTMLElement(dom[0]);
+        return element;

     },
     before: function(params) {
         if(params instanceof DocumentTextElement || params.text)
             return false;
     },
     before: function(params) {
         if(params instanceof DocumentTextElement || params.text)
             return false;

-        var dom;
+        var element;

         if(params instanceof DocumentNodeElement) {
         if(params instanceof DocumentNodeElement) {

-            dom = params.dom();
+            element = params;

         } else {
         } else {

-            dom = DocumentNodeElement.createDOM(params);
+            element = DocumentNodeElement.create(params);

         }
         this.dom().wrap('<div>');
         }
         this.dom().wrap('<div>');

-        this.dom().parent().before(dom[0]);
+        this.dom().parent().before(element.dom());

         this.dom().unwrap();
         this.dom().unwrap();

-        return documentElementFromHTMLElement(dom[0]);
+        return element;

     },
     wrapWithNodeElement: function(wlxmlNode) {
         if(typeof wlxmlNode.start === 'number' && typeof wlxmlNode.end === 'number') {
     },
     wrapWithNodeElement: function(wlxmlNode) {
         if(typeof wlxmlNode.start === 'number' && typeof wlxmlNode.end === 'number') {


@@ -196,10 +357,30 @@ $.extend(DocumentTextElement.prototype, {
         }
     },
     unwrap: function() {
         }
     },
     unwrap: function() {

-        if(this.parent().children().length === 1) {
-            var parent = this.parent();
-            parent.after(this);
+        var parent = this.parent(),
+            toret;
+        if(parent.children().length === 1) {
+            toret = parent.parent();
+            var grandParent = parent.parent();
+            if(grandParent) {
+                var grandParentChildren = grandParent.children(),
+                    idx = grandParent.childIndex(parent),
+                    prev = idx - 1 > -1 ? grandParentChildren[idx-1] : null,
+                    next = idx + 1 < grandParentChildren.length ? grandParentChildren[idx+1] : null;
+                if(prev && next) {
+                    prev.setText(prev.getText() + this.getText() + next.getText());
+                    next.detach();
+                } else if (prev || next) {
+                    var target = prev ? prev : next;
+                    target.setText(target.getText() + this.getText());
+                } else {
+                    parent.after(this);
+                }
+            } else {
+                parent.after(this);
+            }

             parent.detach();
             parent.detach();

+            return toret;

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


@@ -232,22 +413,12 @@ $.extend(DocumentTextElement.prototype, {
         succeedingChildren.forEach(function(child) {
             newElement.append(child);
         });
         succeedingChildren.forEach(function(child) {
             newElement.append(child);
         });

-    }
-});

 
 

-var documentElementFromHTMLElement = function(htmlElement, canvas) {
-    // if(!canvas)
-    //    throw 'no canvas specified';
-    if(htmlElement.nodeType === Node.ELEMENT_NODE)
-        return new DocumentNodeElement(htmlElement, canvas);
-    if(htmlElement.nodeType === Node.TEXT_NODE)
-        return new DocumentTextElement(htmlElement, canvas);
-};
+        return {first: parentElement, second: newElement};
+    },
+});

 
 return {
 
 return {

-    wrap: function(htmlElement, canvas) {
-        return documentElementFromHTMLElement(htmlElement, canvas);
-    },

     DocumentElement: DocumentElement,
     DocumentNodeElement: DocumentNodeElement,
     DocumentTextElement: DocumentTextElement
     DocumentElement: DocumentElement,
     DocumentNodeElement: DocumentNodeElement,
     DocumentTextElement: DocumentTextElement