X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/ef0f264a9a385985afb67cb533cc720787b757fd..a5b0d59:/src/editor/modules/documentCanvas/canvas/comments/comments.js

diff --git a/src/editor/modules/documentCanvas/canvas/comments/comments.js b/src/editor/modules/documentCanvas/canvas/comments/comments.js
index 41ed973..65c80f2 100644
--- a/src/editor/modules/documentCanvas/canvas/comments/comments.js
+++ b/src/editor/modules/documentCanvas/canvas/comments/comments.js
@@ -1,7 +1,7 @@
 define(function(require) {
     
 'use strict';
-/* globals Node, gettext */
+/* globals gettext */
 
 
 var $ = require('libs/jquery'),
@@ -11,7 +11,20 @@ var $ = require('libs/jquery'),
     commentTemplate = require('libs/text!./comment.html');
 
 
-var View = function(node, user) {
+var makeAutoResizable = function(textarea) {
+    textarea.on('input', function() {
+        resize(textarea);
+    });
+};
+
+var resize = function(textarea) {
+    if(textarea.prop('scrollHeight') > textarea.prop('clientHeight')) {
+        textarea.height(textarea.prop('scrollHeight'));
+    }
+};
+
+
+var CommentsView = function(node, user) {
     this.node = node;
     this.user = user;
     this.dom = $(_.template(commentsTemplate)());
@@ -22,13 +35,9 @@ var View = function(node, user) {
 
     this.textarea.on('input', function() {
         this.addButton.attr('disabled', this.textarea.val() === '');
-
-        if (this.textarea.prop('scrollHeight') > this.textarea.prop('clientHeight')) {
-            this.textarea.height(this.textarea.prop('scrollHeight'));
-        }
-
-
     }.bind(this));
+    makeAutoResizable(this.textarea);
+
     this.addButton.hide();
     this.cancelButton.hide();
     this.textarea.on('focus', function() {
@@ -82,47 +91,29 @@ var View = function(node, user) {
 
 };
 
-_.extend(View.prototype, {
+_.extend(CommentsView.prototype, {
     render: function() {
         this.list.empty();
-
-        // while(this.node.getTagName() === 'span' && this.node.parent()) {
-        //     this.node = this.node.parent();
-        // }
         this.textarea.attr('placeholder', gettext('Comment'));
 
         this.node.contents()
             .filter(function(child) {
-                return child.nodeType === Node.ELEMENT_NODE && child.getTagName() === 'aside' && child.getClass() === 'comment';
-                //return child.is({tag: 'aside', klass: 'comment'});
-
+                return child.is({tag: 'aside', klass: 'comment'});
             })
             .forEach(function(commentNode) {
                 var commentView = new CommentView(commentNode);
                 this.list.append(commentView.dom);
                 this.textarea.attr('placeholder', gettext('Respond') + '...');
             }.bind(this));
-        
     },
     onActivated: function() {
-        //if(this.list.find('.comment').length === 0) {
             this.dom.find('.newComment').toggle(true);
-        //}
-       //this.dom.show();
-
     },
     onDeactivated: function() {
       this.dom.find('.newComment').toggle(false);
       this.addButton.hide();
       this.cancelButton.hide();
-      //this.dom.hide();
-
     },
-
-    getHeight: function() {
-        return this.dom.outerHeight();
-    }
-
 });
 
 
@@ -142,19 +133,29 @@ var CommentView = function(commentNode) {
     
     metaData.some(function(row) {
         date = row.getValue();
+        if(/[0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/g.test(date)) {
+            date = date.split(':');
+            date.pop();
+            date = date.join(':');
+        }
         return true;
     }, 'date');
 
     this.dom = $(_.template(commentTemplate)({
-        author: author ||'?',
-        date: date || '?',
+        author: author || '',
+        date: date || '',
         content: this.node.object.getText() || '?'
     }));
 
     this.contentElement = this.dom.find('.content');
     this.editElement = this.dom.find('.edit');
+    this.deleteDialogElement = this.dom.find('.deleteDialog');
 
     this.dom.find('.remove-btn').on('click', function() {
+        this.deleteDialogElement.show();
+    }.bind(this));
+
+    this.dom.find('.deleteDialog-confirm').on('click', function() {
         this.node.document.transaction(function() {
             this.node.detach();
         }.bind(this), {
@@ -164,6 +165,10 @@ var CommentView = function(commentNode) {
         });
     }.bind(this));
 
+    this.dom.find('.deleteDialog-cancel').on('click', function() {
+        this.deleteDialogElement.hide();
+    }.bind(this));
+
     this.dom.find('.edit-start-btn').on('click', function() {
         this.startEditing();
     }.bind(this));
@@ -179,13 +184,8 @@ var CommentView = function(commentNode) {
     this.textarea = this.editElement.find('textarea');
     this.textarea.on('input', function() {
         this.dom.find('.edit-save-btn').attr('disabled', this.textarea.val() === '');
-
-        if (this.textarea.prop('scrollHeight') > this.textarea.prop('clientHeight')) {
-            this.textarea.height(this.textarea.prop('scrollHeight'));
-        }
-
-
     }.bind(this));
+    makeAutoResizable(this.textarea);
 };
 
 $.extend(CommentView.prototype, {
@@ -193,9 +193,7 @@ $.extend(CommentView.prototype, {
         this.contentElement.hide();
         this.editElement.show();
         this.textarea.val(this.node.object.getText());
-        if(this.textarea.prop('scrollHeight') > this.textarea.prop('clientHeight')) {
-            this.textarea.height(this.textarea.prop('scrollHeight'));
-        }
+        resize(this.textarea);
         this.textarea.focus();
     },
     saveEditing: function() {
@@ -216,6 +214,6 @@ $.extend(CommentView.prototype, {
 });
 
 
-return View;
+return CommentsView;
 
 });
\ No newline at end of file