empty text nodes after spans

[fnpeditor.git] / 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 5e653b8..daa37ad 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/documentElement.js
+++ b/src/editor/modules/documentCanvas/canvas/documentElement.js
@@ -1,8 +1,9 @@
 define([
 'libs/jquery',
 'libs/underscore',
 define([
 'libs/jquery',
 'libs/underscore',

-'modules/documentCanvas/canvas/utils'
-], function($, _, utils) {
+'modules/documentCanvas/canvas/utils',
+'modules/documentCanvas/canvas/container'
+], function($, _, utils, container) {

     
 'use strict';
 /* global Node:false */
     
 'use strict';
 /* global Node:false */


@@ -78,6 +79,9 @@ $.extend(DocumentElement.prototype, {
     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];
     },

+    isRootElement: function() {
+        return this.sameNode(this.canvas.rootElement);
+    },

 
     trigger: function() {
         this.canvas.eventBus.trigger.apply(this.canvas.eventBus, Array.prototype.slice.call(arguments, 0));
 
     trigger: function() {
         this.canvas.eventBus.trigger.apply(this.canvas.eventBus, Array.prototype.slice.call(arguments, 0));


@@ -90,6 +94,9 @@ $.extend(DocumentElement.prototype, {
 // DocumentNodeElement represents an element node from WLXML document rendered inside Canvas
 var DocumentNodeElement = function(wlxmlNode, canvas) {
     DocumentElement.call(this, wlxmlNode, canvas);
 // DocumentNodeElement represents an element node from WLXML document rendered inside Canvas
 var DocumentNodeElement = function(wlxmlNode, canvas) {
     DocumentElement.call(this, wlxmlNode, canvas);

+    this.containers = [];
+    this.elementsRegister = canvas.createElementsRegister();
+    this.contextMenuActions = [];

     this.init(this.dom);
 };
 
     this.init(this.dom);
 };
 


@@ -99,7 +106,7 @@ var manipulate = function(e, params, action) {
     if(params instanceof DocumentElement) {
         element = params;
     } else {
     if(params instanceof DocumentElement) {
         element = params;
     } else {

-        element = e.canvas.createElement(params);
+        element = e.createElement(params);

     }
     if(element.dom) {
         e.dom[action](element.dom);
     }
     if(element.dom) {
         e.dom[action](element.dom);


@@ -130,10 +137,42 @@ $.extend(DocumentNodeElement.prototype, {
         }
         this.gutterGroup.addView(view);
     },
         }
         this.gutterGroup.addView(view);
     },

+    createContainer: function(nodes, params) {
+        var toret = container.create(nodes, params, this);
+        this.containers.push(toret);
+        return toret;
+    },
+    removeContainer: function(container) {
+        var idx;
+        if((idx = this.containers.indexOf(container)) !== -1) {
+            this.containers.splice(idx, 1);
+        }
+    },
+    createElement: function(wlxmlNode) {
+        var parent = this.wlxmlNode.parent() ? utils.getElementForNode(this.wlxmlNode.parent()) : null;
+        return this.canvas.createElement(wlxmlNode, this.elementsRegister, !parent) || parent.createElement(wlxmlNode);
+    },
+    addToContextMenu: function(actionFqName) {
+        this.contextMenuActions.push(this.canvas.createAction(actionFqName));
+    },

     handle: function(event) {
     handle: function(event) {

-        var method = 'on' + event.type[0].toUpperCase() + event.type.substr(1);
-        if(this[method]) {
-            this[method](event);
+        var method = 'on' + event.type[0].toUpperCase() + event.type.substr(1),
+            target;
+        if(event.type === 'nodeAdded' || event.type === 'nodeDetached') {
+            this.containers.some(function(container) {
+                if(container.manages(event.meta.node, event.meta.parent)) {
+                    target = container;
+                    return true;
+                }
+            });
+        }
+        
+        if(!target && this[method]) {
+            target = this;
+        }
+        
+        if(target) {
+            target[method](event);

         }
     },
     createDOM: function() {
         }
     },
     createDOM: function() {


@@ -202,6 +241,9 @@ $.extend(DocumentNodeElement.prototype, {
         // })
         this.dom.css('display', what);
         this._container().css('display', what);
         // })
         this.dom.css('display', what);
         this._container().css('display', what);

+    },
+    children: function() {
+        return [];

     }
 });
 
     }
 });
 


@@ -236,7 +278,7 @@ $.extend(DocumentTextElement.prototype, {
         if(text === '') {
             text = utils.unicode.ZWS;
         }
         if(text === '') {
             text = utils.unicode.ZWS;
         }

-        if(text !== this.getText()) {
+        if(text !== this.dom.contents()[0].data) {

             this.dom.contents()[0].data = text;
         }
     },
             this.dom.contents()[0].data = text;
         }
     },


@@ -263,7 +305,7 @@ $.extend(DocumentTextElement.prototype, {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {

-            element = this.canvas.createElement(params);
+            element = this.parent().createElement(params);

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


@@ -281,7 +323,7 @@ $.extend(DocumentTextElement.prototype, {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {
         if(params instanceof DocumentNodeElement) {
             element = params;
         } else {

-            element = this.canvas.createElement(params);
+            element = this.createElement(params);

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