editor: refactoring - remove old unnecessary markup

[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 a08788b..948e8df 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/documentElement.js
+++ b/src/editor/modules/documentCanvas/canvas/documentElement.js
@@ -11,6 +11,10 @@ define([
 var DocumentElement = function(wlxmlNode, canvas) {
     this.wlxmlNode = wlxmlNode;
     this.canvas = canvas;
 var DocumentElement = function(wlxmlNode, canvas) {
     this.wlxmlNode = wlxmlNode;
     this.canvas = canvas;

+    this.state = {
+        exposed: false,
+        active: false
+    };

 
     this.dom = this.createDOM();
     this.dom.data('canvas-element', this);
 
     this.dom = this.createDOM();
     this.dom.data('canvas-element', this);


@@ -26,6 +30,32 @@ $.extend(DocumentElement.prototype, {
     refresh: function() {
         // noop
     },
     refresh: function() {
         // noop
     },

+    updateState: function(toUpdate) {
+        var changes = {};
+        _.keys(toUpdate)
+            .filter(function(key) {
+                return this.state.hasOwnProperty(key);
+            }.bind(this))
+            .forEach(function(key) {
+                if(this.state !== toUpdate[key]) {
+                    this.state[key] = changes[key] = toUpdate[key];
+                }
+            }.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() {
         var parents = this.dom.parents('[document-node-element]');
         if(parents.length) {
     parent: function() {
         var parents = this.dom.parents('[document-node-element]');
         if(parents.length) {


@@ -71,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;
 };
 


@@ -88,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]) {


@@ -102,7 +144,7 @@ $.extend(DocumentNodeElement.prototype, {
             contentContainer = $('<div>')
                 .attr('document-element-content', '');
         
             contentContainer = $('<div>')
                 .attr('document-element-content', '');
         

-        wrapper.append(widgetsContainer, contentContainer);
+        wrapper.append(contentContainer, widgetsContainer);

         widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
         return wrapper;
     },
         widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
         return wrapper;
     },


@@ -112,7 +154,6 @@ $.extend(DocumentNodeElement.prototype, {
     detach: function() {
         var parents = this.parents();
         this.dom.detach();
     detach: function() {
         var parents = this.parents();
         this.dom.detach();

-        this.canvas = null;

         if(parents[0]) {
             parents[0].refreshPath();
         }
         if(parents[0]) {
             parents[0].refreshPath();
         }


@@ -126,17 +167,6 @@ $.extend(DocumentNodeElement.prototype, {
         return manipulate(this, params, 'after');
     },
 
         return manipulate(this, params, 'after');
     },
 

-    toggleLabel: function(toggle) {
-        var displayCss = toggle ? 'inline-block' : 'none';
-        var label = this.dom.children('.canvas-widgets').find('.canvas-widget-label');
-        label.css('display', displayCss);
-        this.toggleHighlight(toggle);
-    },
-
-    toggleHighlight: function(toggle) {
-        this._container().toggleClass('highlighted-element', toggle);
-    },
-

     isBlock: function() {
         return this.dom.css('display') === 'block';
     },
     isBlock: function() {
         return this.dom.css('display') === 'block';
     },


@@ -186,21 +216,16 @@ $.extend(DocumentTextElement.prototype, {
     },
     detach: function() {
         this.dom.detach();
     },
     detach: function() {
         this.dom.detach();

-        this.canvas = null;

         return this;
     },
         return this;
     },

-    handle: function(event) {
-        var toSet = event.meta.node.getText();
-        if(toSet === '') {
-            toSet = utils.unicode.ZWS;
+    setText: function(text) {
+        if(text === '') {
+            text = utils.unicode.ZWS;

         }
         }

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

         }
     },
         }
     },

-    setText: function(text) {
-        this.dom.contents()[0].data = text;
-    },

     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();


@@ -223,10 +248,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) {


@@ -239,16 +266,15 @@ $.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;
     },
 

-    toggleHighlight: function() {
-        // do nothing for now
-    },

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