X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/d0db6d70e04af12eeac7275d6140b53df001aa1e..bedc5daf8a42c50c84b8c43b5924c10d07ed0b3a:/modules/documentCanvas/canvas/documentElement.js

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index 49fcd22..f6137ef 100644
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -6,15 +6,42 @@ 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;
     },
@@ -43,16 +70,28 @@ $.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 element;
@@ -65,6 +104,8 @@ var manipulate = function(e, params, action) {
     return element;
 };
 
+DocumentNodeElement.prototype = new DocumentElement();
+
 $.extend(DocumentNodeElement.prototype, {
     append: function(params) {
         manipulate(this, params, 'append');
@@ -133,54 +174,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);
-};
-
-DocumentElement.fromHTMLElement = function(htmlElement, canvas) {
-    if(htmlElement.nodeType === Node.ELEMENT_NODE)
-        return DocumentNodeElement.fromHTMLElement(htmlElement, canvas);
-    if(htmlElement.nodeType === Node.TEXT_NODE)
-        return DocumentTextElement.fromHTMLElement(htmlElement, canvas);
-}
-
-DocumentNodeElement.createDOM = function(params) {
-    var dom = $('<div>').attr('wlxml-tag', params.tag);
-    if(params.klass)
-        dom.attr('wlxml-class', params.klass);
-    return dom;
-};
-
-DocumentTextElement.createDOM = function(params) {
-    return $(document.createTextNode(params.text));
-};
-
-DocumentNodeElement.create = function(params, canvas) {
-    return this.fromHTMLElement(this.createDOM(params)[0]);
+// DocumentNodeElement represents a text node from WLXML document rendered inside Canvas
+var DocumentTextElement = function(htmlElement, canvas) {
+    DocumentElement.call(this, htmlElement, canvas);
 };
 
-DocumentTextElement.create = function(params, canvas) {
-    return this.fromHTMLElement(this.createDOM(params)[0]);
-};
+$.extend(DocumentTextElement, {
+    createDOM: function(params) {
+        return $('<div>')
+            .attr('wlxml-text', '')
+            .text(params.text);
+    },
 
-DocumentNodeElement.fromHTMLElement = function(htmlElement, canvas) {
-    return new this(htmlElement, canvas);
-};
+    create: function(params, canvas) {
+        return this.fromHTMLElement(this.createDOM(params)[0]);
+    },
 
-DocumentTextElement.fromHTMLElement = function(htmlElement, canvas) {
-    return new this(htmlElement, canvas);
-};
+    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();