editor: canvas fix

[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 956d0a7..50a188a 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/documentElement.js
+++ b/src/editor/modules/documentCanvas/canvas/documentElement.js
@@ -18,6 +18,7 @@ var DocumentElement = function(wlxmlNode, canvas) {
 
     this.dom = this.createDOM();
     this.dom.data('canvas-element', this);
 
     this.dom = this.createDOM();
     this.dom.data('canvas-element', this);

+    this.wlxmlNode.setData('canvasElement', this);

 };
 
 $.extend(DocumentElement.prototype, {
 };
 
 $.extend(DocumentElement.prototype, {


@@ -43,6 +44,17 @@ $.extend(DocumentElement.prototype, {
             }.bind(this));
         if(_.isFunction(this.onStateChange)) {
             this.onStateChange(changes);
             }.bind(this));
         if(_.isFunction(this.onStateChange)) {
             this.onStateChange(changes);

+            if(_.isBoolean(changes.active)) {
+                if(changes.active) {
+                    var ptr = this;
+                    while(ptr && ptr.wlxmlNode.getTagName() === 'span') {
+                        ptr = ptr.parent();
+                    }
+                    if(ptr && ptr.gutterGroup) {
+                        ptr.gutterGroup.show();
+                    }
+                }
+            }

         }
     },
     parent: function() {
         }
     },
     parent: function() {


@@ -78,7 +90,6 @@ $.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);

-    wlxmlNode.setData('canvasElement', this);

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


@@ -90,8 +101,10 @@ var manipulate = function(e, params, action) {
     } else {
         element = e.canvas.createElement(params);
     }
     } else {
         element = e.canvas.createElement(params);
     }

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

     return element;
 };
 
     return element;
 };
 


@@ -107,6 +120,16 @@ $.extend(DocumentNodeElement.prototype, {
     clearWidgets: function() {
         this.dom.children('.canvas-widgets').empty();
     },
     clearWidgets: function() {
         this.dom.children('.canvas-widgets').empty();
     },

+    addToGutter: function(view) {
+        if(!this.gutterGroup) {
+            this.gutterGroup = this.canvas.gutter.createViewGroup({
+                offsetHint: function() {
+                    return this.canvas.getElementOffset(this);
+                }.bind(this)
+            }, this);
+        }
+        this.gutterGroup.addView(view);
+    },

     handle: function(event) {
         var method = 'on' + event.type[0].toUpperCase() + event.type.substr(1);
         if(this[method]) {
     handle: function(event) {
         var method = 'on' + event.type[0].toUpperCase() + event.type.substr(1);
         if(this[method]) {


@@ -128,13 +151,26 @@ $.extend(DocumentNodeElement.prototype, {
     _container: function() {
         return this.dom.children('[document-element-content]');
     },
     _container: function() {
         return this.dom.children('[document-element-content]');
     },

-    detach: function() {
-        var parents = this.parents();
-        this.dom.detach();
-        if(parents[0]) {
-            parents[0].refreshPath();
+    detach: function(isChild) {
+        var parents;
+
+        if(this.gutterGroup) {
+            this.gutterGroup.remove();
+        }
+        if(_.isFunction(this.children)) {
+            this.children().forEach(function(child) {
+                child.detach(true);
+            });
+        }
+
+        if(!isChild) {
+            parents = this.parents();
+            this.dom.detach();
+            if(parents[0]) {
+                parents[0].refreshPath();
+            }

         }
         }

-         return this;
+        return this;

     },
     before: function(params) {
         return manipulate(this, params, 'before');
     },
     before: function(params) {
         return manipulate(this, params, 'before');


@@ -191,8 +227,10 @@ $.extend(DocumentTextElement.prototype, {
             .text(this.wlxmlNode.getText() || utils.unicode.ZWS);
         return dom;
     },
             .text(this.wlxmlNode.getText() || utils.unicode.ZWS);
         return dom;
     },

-    detach: function() {
-        this.dom.detach();
+    detach: function(isChild) {
+        if(!isChild) {
+            this.dom.detach();
+        }

         return this;
     },
     setText: function(text) {
         return this;
     },
     setText: function(text) {


@@ -203,6 +241,9 @@ $.extend(DocumentTextElement.prototype, {
             this.dom.contents()[0].data = text;
         }
     },
             this.dom.contents()[0].data = text;
         }
     },

+    handle: function(event) {
+        this.setText(event.meta.node.getText());
+    },

     getText: function(options) {
         options = _.extend({raw: false}, options || {});
         var toret = this.dom.text();
     getText: function(options) {
         options = _.extend({raw: false}, options || {});
         var toret = this.dom.text();


@@ -225,10 +266,12 @@ $.extend(DocumentTextElement.prototype, {
         } else {
             element = this.canvas.createElement(params);
         }
         } else {
             element = this.canvas.createElement(params);
         }

-        this.dom.wrap('<div>');
-        this.dom.parent().after(element.dom);
-        this.dom.unwrap();
-        this.refreshPath();
+        if(element.dom) {
+            this.dom.wrap('<div>');
+            this.dom.parent().after(element.dom);
+            this.dom.unwrap();
+            this.refreshPath();
+        }

         return element;
     },
     before: function(params) {
         return element;
     },
     before: function(params) {


@@ -241,10 +284,12 @@ $.extend(DocumentTextElement.prototype, {
         } else {
             element = this.canvas.createElement(params);
         }
         } else {
             element = this.canvas.createElement(params);
         }

-        this.dom.wrap('<div>');
-        this.dom.parent().before(element.dom);
-        this.dom.unwrap();
-        this.refreshPath();
+        if(element.dom) {
+            this.dom.wrap('<div>');
+            this.dom.parent().before(element.dom);
+            this.dom.unwrap();
+            this.refreshPath();
+        }

         return element;
     },
 
         return element;
     },