X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/fa35a2ccd01eccad357d79258de134a4e0f9d6ea..059e387a80cf9c52b4a17d9f174ecdb7de492d25:/src/editor/modules/documentCanvas/canvas/genericElement.js?ds=sidebyside

diff --git a/src/editor/modules/documentCanvas/canvas/genericElement.js b/src/editor/modules/documentCanvas/canvas/genericElement.js
index 4f4da9b..a769240 100644
--- a/src/editor/modules/documentCanvas/canvas/genericElement.js
+++ b/src/editor/modules/documentCanvas/canvas/genericElement.js
@@ -6,14 +6,8 @@ var $ = require('libs/jquery'),
     _ = require('libs/underscore'),
     documentElement = require('./documentElement'),
     utils = require('./utils'),
-    wlxmlUtils = require('utils/wlxml');
+    CommentsView = require('./comments/comments');
 
-var labelWidget = function(tag, klass) {
-    return $('<span>')
-        .addClass('canvas-widget canvas-widget-label')
-        .text(wlxmlUtils.getTagLabel(tag) + (klass ? ' / ' + wlxmlUtils.getClassLabel(klass) : ''));
-};
-void(labelWidget); // for linters; labelWidget is unused on purpose for now
 
 var DocumentNodeElement = documentElement.DocumentNodeElement;
 
@@ -23,8 +17,9 @@ $.extend(generic, {
     init: function() {
         DocumentNodeElement.prototype.init.call(this);
         this._container()
-            .attr('wlxml-tag', this.wlxmlNode.getTagName());
-        this.setWlxmlClass(this.wlxmlNode.getClass());
+            .attr('wlxml-tag', this.wlxmlNode.getTagName())
+            .attr('wlxml-class', this.wlxmlNode.getClass().replace(/\./g, '-'));
+
         this.wlxmlNode.contents().forEach(function(node) {
             var el = this.canvas.createElement(node);
             if(el.dom) {
@@ -32,6 +27,8 @@ $.extend(generic, {
             }
         }.bind(this));
 
+        this.commentsView = new CommentsView(this.wlxmlNode, this.canvas.metadata.user);
+        this.addToGutter(this.commentsView);
         this.commentTip = $('<div class="comment-tip"><i class="icon-comment"></i></div>');
         this.addWidget(this.commentTip);
 
@@ -77,13 +74,18 @@ $.extend(generic, {
         return toret;
     },
 
-    getVerticallyFirstTextElement: function() {
+    getVerticallyFirstTextElement: function(params) {
         var toret;
+        
+        params = _.extend({
+            considerChildren: true
+        }, params);
+        
         this.children().some(function(child) {
             if(child instanceof documentElement.DocumentTextElement) {
                 toret = child;
                 return true; // break
-            } else {
+            } else if(params.considerChildren) {
                 toret = child.getVerticallyFirstTextElement();
                 if(toret) {
                     return true; // break
@@ -93,11 +95,6 @@ $.extend(generic, {
         return toret;
     },
 
-    onNodeAttrChange: function(event) {
-        if(event.meta.attr === 'class') {
-            this.setWlxmlClass(event.meta.newVal); //
-        }
-    },
     onNodeAdded: function(event) {
         if(event.meta.node.isRoot()) {
             this.canvas.reloadRoot();
@@ -130,6 +127,7 @@ $.extend(generic, {
 
         if(event.meta.node.is('comment')) {
             this.commentTip.show();
+            this.commentsView.render();
         }
     },
     onNodeDetached: function(event) {
@@ -146,21 +144,17 @@ $.extend(generic, {
             if(isComment && !this.wlxmlNode.hasChild({klass: 'comment'})) {
                 this.commentTip.hide();
             }
+            this.commentsView.render();
         }
     },
     onNodeTextChange: function(event) {
-        var toSet = event.meta.node.getText();
-        this.children().some(function(child) {
-            if(child.wlxmlNode.sameNode(event.meta.node)) {
-                if(toSet === '') {
-                    toSet = utils.unicode.ZWS;
-                }
-                if(toSet !== child.getText()) {
-                    child.setText(toSet);
-                }
-                return true;
-            }
-        });
+        var node = event.meta.node;
+
+        /* TODO: This handling of changes to the comments should probably be implemented via separate,
+        non-rendering comments element */
+        if(node.parent() && node.parent().is('comment') && this.wlxmlNode.sameNode(node.parent().parent())) {
+            this.commentsView.render();
+        }
     },
 
     onStateChange: function(changes) {
@@ -216,26 +210,6 @@ $.extend(generic, {
             }
         });
         return toret;
-    },
-
-    getWlxmlClass: function() {
-        var klass = this._container().attr('wlxml-class');
-        if(klass) {
-            return klass.replace(/-/g, '.');
-        }
-        return undefined;
-    },
-    setWlxmlClass: function(klass) {
-        if(klass === this.getWlxmlClass()) {
-            return;
-        }
-        if(klass) {
-            this._container().attr('wlxml-class', klass.replace(/\./g, '-'));
-        }
-        else {
-            this._container().removeAttr('wlxml-class');
-        }
-        this.refreshPath();
     }
 });