X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/ecf245195f18fa05ff987a10f8e26d53ba8f36ed..064901239c2478c0fa4763812771cb370c76742d:/modules/documentCanvas/canvas/documentElement.js

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index bef9fdd..f6137ef 100644
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -6,22 +6,49 @@ define([
 '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;
-    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, {
+    _setupDOMHandler: function(htmlElement) {
+        this.$element = $(htmlElement);
+    },
     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;
     },
 
@@ -43,28 +70,42 @@ $.extend(DocumentElement.prototype, {
 });
 
 
+// DocumentNodeElement represents an element node from WLXML document rendered inside 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 dom;
+    var element;
     if(params instanceof DocumentElement) {
-        dom = params.dom()
+        element = params;
     } else {
-        dom = DocumentElement.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, {
     append: function(params) {
         manipulate(this, params, 'append');
@@ -85,7 +126,7 @@ $.extend(DocumentNodeElement.prototype, {
         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) {
@@ -132,30 +173,40 @@ $.extend(DocumentNodeElement.prototype, {
     }
 });
 
-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]);
+    },
 
+    fromHTMLElement: function(htmlElement, canvas) {
+        return new this(htmlElement, canvas);
+    }
+});
+
+DocumentTextElement.prototype = new DocumentElement();
 
 $.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) {
-        this.dom()[0].data = text;
+        this.dom().contents()[0].data = text;
     },
     getText: function() {
         return this.dom().text();
@@ -163,30 +214,30 @@ $.extend(DocumentTextElement.prototype, {
     after: function(params) {
         if(params instanceof DocumentTextElement || params.text)
             return false;
-        var dom;
+        var element;
         if(params instanceof DocumentNodeElement) {
-            dom = params.dom();
+            element = params;
         } else {
-            dom = DocumentNodeElement.createDOM(params);
+            element = DocumentNodeElement.create(params);
         }
         this.dom().wrap('<div>');
-        this.dom().parent().after(dom[0]);
+        this.dom().parent().after(element.dom());
         this.dom().unwrap();
-        return documentElementFromHTMLElement(dom[0]);
+        return element;
     },
     before: function(params) {
         if(params instanceof DocumentTextElement || params.text)
             return false;
-        var dom;
+        var element;
         if(params instanceof DocumentNodeElement) {
-            dom = params.dom();
+            element = params;
         } else {
-            dom = DocumentNodeElement.createDOM(params);
+            element = DocumentNodeElement.create(params);
         }
         this.dom().wrap('<div>');
-        this.dom().parent().before(dom[0]);
+        this.dom().parent().before(element.dom());
         this.dom().unwrap();
-        return documentElementFromHTMLElement(dom[0]);
+        return element;
     },
     wrapWithNodeElement: function(wlxmlNode) {
         if(typeof wlxmlNode.start === 'number' && typeof wlxmlNode.end === 'number') {
@@ -258,19 +309,7 @@ $.extend(DocumentTextElement.prototype, {
     }
 });
 
-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 {
-    wrap: function(htmlElement, canvas) {
-        return documentElementFromHTMLElement(htmlElement, canvas);
-    },
     DocumentElement: DocumentElement,
     DocumentNodeElement: DocumentNodeElement,
     DocumentTextElement: DocumentTextElement