X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/264005bc6b4f629d4ef7d32c0aa626e3da7afbc7..22a990585c518e18de8fd2b023145d6ac305a6fa:/src/editor/modules/documentCanvas/canvas/documentElement.js

diff --git a/src/editor/modules/documentCanvas/canvas/documentElement.js b/src/editor/modules/documentCanvas/canvas/documentElement.js
index b5269ca..5ed3d20 100644
--- a/src/editor/modules/documentCanvas/canvas/documentElement.js
+++ b/src/editor/modules/documentCanvas/canvas/documentElement.js
@@ -2,49 +2,26 @@ define([
 'libs/jquery',
 'libs/underscore',
 'modules/documentCanvas/canvas/utils',
-'modules/documentCanvas/canvas/widgets',
 'modules/documentCanvas/canvas/wlxmlManagers'
-], function($, _, utils, widgets, wlxmlManagers) {
+], function($, _, utils, wlxmlManagers) {
     
 'use strict';
 /* global Node:false, document:false */
 
 
 // DocumentElement represents a text or an element node from WLXML document rendered inside Canvas
-var DocumentElement = function(htmlElement, canvas) {
+var DocumentElement = function(wlxmlNode, canvas) {
     if(arguments.length === 0) {
         return;
     }
+    this.wlxmlNode = wlxmlNode;
     this.canvas = canvas;
-    this._setupDOMHandler(htmlElement);
-};
-
 
-var elementTypeFromWlxmlNode = function(wlxmlNode) {
-    return wlxmlNode.nodeType === Node.TEXT_NODE ? DocumentTextElement : DocumentNodeElement;
+    this.$element = this.createDOM();
+    this.$element.data('canvas-element', this);
 };
 
-$.extend(DocumentElement, {
-    create: function(node, canvas) {
-        return elementTypeFromWlxmlNode(node).create(node, canvas);
-    },
-
-    fromHTMLElement: function(htmlElement, canvas) {
-        var $element = $(htmlElement);
-        if(htmlElement.nodeType === Node.ELEMENT_NODE && $element.attr('document-node-element') !== undefined) {
-            return DocumentNodeElement.fromHTMLElement(htmlElement, canvas);
-        }
-        if($element.attr('document-text-element') !== undefined || (htmlElement.nodeType === Node.TEXT_NODE && $element.parent().attr('document-text-element') !== undefined)) {
-            return DocumentTextElement.fromHTMLElement(htmlElement, canvas);
-        }
-        return undefined;
-    }
-});
-
 $.extend(DocumentElement.prototype, {
-    _setupDOMHandler: function(htmlElement) {
-        this.$element = $(htmlElement);
-    },
     bound: function() {
         return $.contains(document.documentElement, this.dom()[0]);
     },
@@ -62,7 +39,7 @@ $.extend(DocumentElement.prototype, {
     parent: function() {
         var parents = this.$element.parents('[document-node-element]');
         if(parents.length) {
-            return DocumentElement.fromHTMLElement(parents[0], this.canvas);
+            return this.canvas.getDocumentElement(parents[0]);
         }
         return null;
     },
@@ -138,54 +115,18 @@ $.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 DocumentNodeElement = function(wlxmlNode, canvas) {
+    DocumentElement.call(this, wlxmlNode, canvas);
+    wlxmlNode.setData('canvasElement', this);
 };
 
-$.extend(DocumentNodeElement, {
-    create: function(wlxmlNode, canvas) {
-        return this.fromHTMLElement(this.createDOM(wlxmlNode, canvas)[0], canvas);
-    },
-
-    fromHTMLElement: function(htmlElement, canvas) {
-        return new this(htmlElement, canvas);
-    },
-
-    createDOM: function(wlxmlNode, canvas) {
-        var dom = $('<div>')
-                .attr('document-node-element', ''),
-            widgetsContainer = $('<div>')
-                .addClass('canvas-widgets')
-                .attr('contenteditable', false),
-            container = $('<div>')
-                .attr('document-element-content', '');
-        
-        dom.append(widgetsContainer, container);
-        // Make sure widgets aren't navigable with arrow keys
-        widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
-
-        var element = this.fromHTMLElement(dom[0], canvas);
-
-        element.data('wlxmlNode', wlxmlNode);
-        wlxmlNode.setData('canvasElement', element);
-
-        element.setWlxml({tag: wlxmlNode.getTagName(), klass: wlxmlNode.getClass()});
-
-        wlxmlNode.contents().forEach(function(node) {
-            container.append(DocumentElement.create(node, canvas).dom());
-        }.bind(this));
-
-        return dom;
-    }
-
-});
 
 var manipulate = function(e, params, action) {
     var element;
     if(params instanceof DocumentElement) {
         element = params;
     } else {
-        element = DocumentElement.create(params);
+        element = e.canvas.createElement(params);
     }
     var target = (action === 'append' || action === 'prepend') ? e._container() : e.dom();
     target[action](element.dom());
@@ -196,6 +137,26 @@ DocumentNodeElement.prototype = new DocumentElement();
 
 
 $.extend(DocumentNodeElement.prototype, {
+    createDOM: function() {
+        var dom = $('<div>')
+                .attr('document-node-element', ''),
+            widgetsContainer = $('<div>')
+                .addClass('canvas-widgets')
+                .attr('contenteditable', false),
+            container = $('<div>')
+                .attr('document-element-content', '');
+        
+        dom.append(widgetsContainer, container);
+        // Make sure widgets aren't navigable with arrow keys
+        widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
+        this.$element = dom; //@!!!
+        this.setWlxml({tag: this.wlxmlNode.getTagName(), klass: this.wlxmlNode.getClass()});
+
+        this.wlxmlNode.contents().forEach(function(node) {
+            container.append(this.canvas.createElement(node).dom());
+        }.bind(this));
+        return dom;
+    },
     _container: function() {
         return this.dom().children('[document-element-content]');
     },
@@ -205,9 +166,6 @@ $.extend(DocumentNodeElement.prototype, {
         return this;
     },
     append: function(params) {
-        if(params.tag !== 'span') {
-            this.data('orig-end', undefined);
-        }
         return manipulate(this, params, 'append');
     },
     prepend: function(params) {
@@ -229,19 +187,11 @@ $.extend(DocumentNodeElement.prototype, {
 
         var elementContent = this._container().contents();
         var element = this;
-        elementContent.each(function(idx) {
-            var childElement = DocumentElement.fromHTMLElement(this, element.canvas);
+        elementContent.each(function() {
+            var childElement = element.canvas.getDocumentElement(this);
             if(childElement === undefined) {
                 return true;
             }
-            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(toret[toret.length-1] instanceof DocumentNodeElement && $.trim($(this).text()) === '') {
-                    return true;
-                }
-            }
             toret.push(childElement);
         });
         return toret;
@@ -334,27 +284,11 @@ $.extend(DocumentNodeElement.prototype, {
 
 
 // DocumentNodeElement represents a text node from WLXML document rendered inside Canvas
-var DocumentTextElement = function(htmlElement, canvas) {
-    DocumentElement.call(this, htmlElement, canvas);
+var DocumentTextElement = function(wlxmlTextNode, canvas) {
+    DocumentElement.call(this, wlxmlTextNode, canvas);
 };
 
 $.extend(DocumentTextElement, {
-    createDOM: function(wlxmlTextNode, canvas) {
-        var dom = $('<div>')
-            .attr('document-text-element', '')
-            .text(wlxmlTextNode.getText() || utils.unicode.ZWS),
-        element = this.fromHTMLElement(dom[0], canvas);
-        element.data('wlxmlNode', wlxmlTextNode);
-        return dom;
-    },
-
-    create: function(wlxmlTextNode, canvas) {
-        return this.fromHTMLElement(this.createDOM(wlxmlTextNode, canvas)[0], canvas);
-    },
-
-    fromHTMLElement: function(htmlElement, canvas) {
-        return new this(htmlElement, canvas);
-    },
     isContentContainer: function(htmlElement) {
         return htmlElement.nodeType === Node.TEXT_NODE && $(htmlElement).parent().is('[document-text-element]');
     }
@@ -363,14 +297,10 @@ $.extend(DocumentTextElement, {
 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;
-        }
+    createDOM: function() {
+        return $('<div>')
+            .attr('document-text-element', '')
+            .text(this.wlxmlNode.getText() || utils.unicode.ZWS);
     },
     detach: function() {
         this.dom().detach();
@@ -400,7 +330,7 @@ $.extend(DocumentTextElement.prototype, {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {
-            element = DocumentElement.create(params, this.canvas);
+            element = this.canvas.createElement(params);
         }
         this.dom().wrap('<div>');
         this.dom().parent().after(element.dom());
@@ -415,7 +345,7 @@ $.extend(DocumentTextElement.prototype, {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {
-            element = DocumentNodeElement.create(params, this.canvas);
+            element = this.canvas.createElement(params);
         }
         this.dom().wrap('<div>');
         this.dom().parent().before(element.dom());
@@ -423,27 +353,6 @@ $.extend(DocumentTextElement.prototype, {
         return element;
     },
 
-    divide: function(params) {
-        var myText = this.getText();
-
-        if(params.offset === myText.length) {
-            return this.after(params);
-        }
-        if(params.offset === 0) {
-            return this.before(params);
-        }
-
-        var lhsText = myText.substr(0, params.offset),
-            rhsText = myText.substr(params.offset),
-            newElement = DocumentNodeElement.create({tag: params.tag, klass: params.klass}, this.canvas),
-            rhsTextElement = DocumentTextElement.create({text: rhsText});
-
-        this.setText(lhsText);
-        this.after(newElement);
-        newElement.after(rhsTextElement);
-        return newElement;
-    },
-
     toggleHighlight: function() {
         // do nothing for now
     }