Merge pull request #1407 from nextcloud/multiline_comments

Bring back multiline comments

3 files changed, 14 insertions, 5 deletions

diff --git a/apps/comments/css/comments.css b/apps/comments/css/comments.css
index 103564c5faf..667f32871bb 100644
--- a/apps/comments/css/comments.css
+++ b/apps/comments/css/comments.css
@@ -21,15 +21,16 @@
 	width: calc(100% - 81px); /* 36 (left margin) + 30 (right padding) + 15 (right padding of surrounding box) */
 	margin-left: 36px;
 	padding-right: 30px;
+	display: block;
 }
 
 #commentsTabView .newCommentForm .submit {
 	position: absolute;
-	top: 1px;
+	bottom: 0px;
 	right: 8px;
 	width: 30px;
 	margin: 0;
-	padding: 9px;
+	padding: 7px 9px;
 	background-color: transparent;
 	border: none;
 	opacity: .3;
@@ -47,6 +48,10 @@
 	margin-right: 6px;
 }
 
+#commentsTabView .newCommentForm textarea {
+	resize: none;
+}
+
 #commentsTabView .comment {
 	position: relative;
 	z-index: 1;
diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index 82244d61e9a..fe3695569bf 100644
--- a/apps/comments/js/commentstabview.js
+++ b/apps/comments/js/commentstabview.js
@@ -32,7 +32,7 @@
 		'{{/if}}' +
 		'    </div>' +
 		'    <form class="newCommentForm">' +
-		'        <input type="text" class="message" placeholder="{{newMessagePlaceholder}}" value="{{message}}" />' +
+		'        <textarea rows="1" class="message" placeholder="{{newMessagePlaceholder}}">{{message}}</textarea>' +
 		'        <input class="submit icon-confirm" type="submit" value="" />' +
 		'{{#if isEditMode}}' +
 		'        <input class="cancel pull-right" type="button" value="{{cancelText}}" />' +
@@ -174,6 +174,8 @@
 			}
 			this.delegateEvents();
 			this.$el.find('.message').on('keydown input change', this._onTypeComment);
+
+			autosize(this.$el.find('.newCommentRow textarea'))
 		},
 
 		_formatItem: function(commentModel) {
@@ -281,6 +283,9 @@
 			$formRow.find('.avatar').replaceWith($comment.find('.avatar').clone());
 			$formRow.find('.has-tooltip').tooltip();
 
+			// Enable autosize
+			autosize($formRow.find('textarea'));
+
 			return false;
 		},
 
@@ -346,7 +351,6 @@
 				}
 			});
 
-
 			return false;
 		},
 
diff --git a/apps/comments/tests/js/commentstabviewSpec.js b/apps/comments/tests/js/commentstabviewSpec.js
index 33c959e430f..470ff0d2217 100644
--- a/apps/comments/tests/js/commentstabviewSpec.js
+++ b/apps/comments/tests/js/commentstabviewSpec.js
@@ -328,7 +328,7 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 			var $formRow = view.$el.find('.newCommentRow.comment[data-id=1]');
 			expect($formRow.length).toEqual(1);
 
-			$formRow.find('input').val('modified message');
+			$formRow.find('textarea').val('modified message');
 			$formRow.find('form').submit();
 
 			expect(saveStub.calledOnce).toEqual(true);