Fixing text to land algorithm - handling case when no child text element exist better

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

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index 937e9d9..7e5824b 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -6,25 +6,62 @@ define([
 '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() {
         var parents = this.$element.parents('[wlxml-tag]');
         if(parents.length)
     dom: function() {
         return this.$element;
     },
     parent: function() {
         var parents = this.$element.parents('[wlxml-tag]');
         if(parents.length)

-            return documentElementFromHTMLElement(parents[0], this.canvas);
+            return DocumentElement.fromHTMLElement(parents[0], this.canvas);

         return null;
     },
 
         return null;
     },
 

+    parents: function() {
+        var parents = [],
+            parent = this.parent();
+        while(parent) {
+            parents.push(parent);
+            parent = parent.parent();
+        }
+        return parents;
+    },
+

     sameNode: function(other) {
         return other && (typeof other === typeof this) && other.dom()[0] === this.dom()[0];
     },
     sameNode: function(other) {
         return other && (typeof other === typeof this) && other.dom()[0] === this.dom()[0];
     },


@@ -39,20 +76,57 @@ $.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, '-'));
+        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 element;
 
 var manipulate = function(e, params, action) {
     var element;


@@ -65,6 +139,8 @@ var manipulate = function(e, params, action) {
     return element;
 };
 
     return element;
 };
 

+DocumentNodeElement.prototype = new DocumentElement();
+

 $.extend(DocumentNodeElement.prototype, {
     append: function(params) {
         manipulate(this, params, 'append');
 $.extend(DocumentNodeElement.prototype, {
     append: function(params) {
         manipulate(this, params, 'append');


@@ -85,7 +161,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) {


@@ -133,39 +209,39 @@ $.extend(DocumentNodeElement.prototype, {
 });
 
 
 });
 
 

-DocumentElement.create = function(params, canvas) {
-    var ElementType = params.text !== undefined ? DocumentTextElement : DocumentNodeElement;
-    return ElementType.create(params);
-};
-
-DocumentElement.createDOM = function(params) {
-    var ElementType = params.text !== undefined ? DocumentTextElement : DocumentNodeElement;
-    return ElementType.createDOM(params);
-};
-
-DocumentNodeElement.createDOM = function(params) {
-    var 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);

 };
 
 };
 

-DocumentTextElement.createDOM = function(params) {
-    return $(document.createTextNode(params.text));
-};
+$.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]);
+    },

 
 

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

 
 

+DocumentTextElement.prototype = new DocumentElement();

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

+    _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();


@@ -265,22 +341,10 @@ $.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 {
 return {

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

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