editor: remove metadata editor which is now not needed

[fnpeditor.git] / src / editor / modules / documentCanvas / canvas / genericElement.js

diff --git a/src/editor/modules/documentCanvas/canvas/genericElement.js b/src/editor/modules/documentCanvas/canvas/genericElement.js
index 4f4da9b..4dfbe59 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/genericElement.js
+++ b/src/editor/modules/documentCanvas/canvas/genericElement.js
@@ -6,7 +6,8 @@ var $ = require('libs/jquery'),
     _ = require('libs/underscore'),
     documentElement = require('./documentElement'),
     utils = require('./utils'),
     _ = require('libs/underscore'),
     documentElement = require('./documentElement'),
     utils = require('./utils'),

-    wlxmlUtils = require('utils/wlxml');
+    wlxmlUtils = require('utils/wlxml'),
+    CommentsView = require('./comments/comments');

 
 var labelWidget = function(tag, klass) {
     return $('<span>')
 
 var labelWidget = function(tag, klass) {
     return $('<span>')


@@ -32,6 +33,8 @@ $.extend(generic, {
             }
         }.bind(this));
 
             }
         }.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);
 
         this.commentTip = $('<div class="comment-tip"><i class="icon-comment"></i></div>');
         this.addWidget(this.commentTip);
 


@@ -77,13 +80,18 @@ $.extend(generic, {
         return toret;
     },
 
         return toret;
     },
 

-    getVerticallyFirstTextElement: function() {
+    getVerticallyFirstTextElement: function(params) {

         var toret;
         var toret;

+        
+        params = _.extend({
+            considerChildren: true
+        }, params);
+        

         this.children().some(function(child) {
             if(child instanceof documentElement.DocumentTextElement) {
                 toret = child;
                 return true; // break
         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
                 toret = child.getVerticallyFirstTextElement();
                 if(toret) {
                     return true; // break


@@ -130,6 +138,7 @@ $.extend(generic, {
 
         if(event.meta.node.is('comment')) {
             this.commentTip.show();
 
         if(event.meta.node.is('comment')) {
             this.commentTip.show();

+            this.commentsView.render();

         }
     },
     onNodeDetached: function(event) {
         }
     },
     onNodeDetached: function(event) {


@@ -146,12 +155,16 @@ $.extend(generic, {
             if(isComment && !this.wlxmlNode.hasChild({klass: 'comment'})) {
                 this.commentTip.hide();
             }
             if(isComment && !this.wlxmlNode.hasChild({klass: 'comment'})) {
                 this.commentTip.hide();
             }

+            this.commentsView.render();

         }
     },
     onNodeTextChange: function(event) {
         }
     },
     onNodeTextChange: function(event) {

-        var toSet = event.meta.node.getText();
-        this.children().some(function(child) {
-            if(child.wlxmlNode.sameNode(event.meta.node)) {
+        var node = event.meta.node,
+            toSet = node.getText(),
+            handled;
+        
+        handled = this.children().some(function(child) {
+            if(child.wlxmlNode.sameNode(node)) {

                 if(toSet === '') {
                     toSet = utils.unicode.ZWS;
                 }
                 if(toSet === '') {
                     toSet = utils.unicode.ZWS;
                 }


@@ -161,6 +174,10 @@ $.extend(generic, {
                 return true;
             }
         });
                 return true;
             }
         });

+
+        if(!handled && node.parent() && node.parent().is('comment') && this.wlxmlNode.sameNode(node.parent().parent())) {
+            this.commentsView.render();
+        }

     },
 
     onStateChange: function(changes) {
     },
 
     onStateChange: function(changes) {