Bring back multiline comments

apps/comments/css/comments.css

@@ -25,7 +25,7 @@
 
 #commentsTabView .newCommentForm .submit {
 	position: absolute;
-	top: 1px;
+	bottom: 1px;
 	right: 8px;
 	width: 30px;
 	margin: 0;
@@ -47,6 +47,10 @@
 	margin-right: 6px;
 }
 
+#commentsTabView .newCommentForm textarea {
+	resize: none;
+}
+
 #commentsTabView .comment {
 	position: relative;
 	z-index: 1;

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

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

bower.json

@@ -31,6 +31,7 @@
     "davclient.js": "https://github.com/evert/davclient.js.git",
     "es6-promise": "https://github.com/jakearchibald/es6-promise.git#~2.3.0",
     "base64": "~0.3.0",
-    "clipboard": "^1.5.12"
+    "clipboard": "^1.5.12",
+    "autosize": "^3.0.17"
   }
 }

core/js/core.json

@@ -11,7 +11,8 @@
 		"backbone/backbone.js",
 		"es6-promise/dist/es6-promise.js",
 		"davclient.js/lib/client.js",
-		"clipboard/dist/clipboard.js"
+		"clipboard/dist/clipboard.js",
+		"autosize/dist/autosize.js"
 	],
 	"libraries": [
 		"jquery-showpassword.js",

core/vendor/.gitignore

@@ -142,3 +142,10 @@ base64/*min.js
 clipboard/**
 !clipboard/dist
 !clipboard/dist/clipboard.js
+
+# autosize
+autosize/**
+!autosize/dist
+!autosize/dist/autosize.js
+!autosize/.bower.json
+!autosize/LICENCE.md

core/vendor/autosize/.bower.json

@@ -0,0 +1,40 @@
+{
+  "name": "autosize",
+  "description": "Autosize is a small, stand-alone script to automatically adjust textarea height to fit text.",
+  "dependencies": {},
+  "keywords": [
+    "textarea",
+    "form",
+    "ui"
+  ],
+  "authors": [
+    {
+      "name": "Jack Moore",
+      "url": "http://www.jacklmoore.com",
+      "email": "hello@jacklmoore.com"
+    }
+  ],
+  "license": "MIT",
+  "homepage": "http://www.jacklmoore.com/autosize",
+  "ignore": [],
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/jackmoore/autosize.git"
+  },
+  "main": "dist/autosize.js",
+  "moduleType": [
+    "amd",
+    "node"
+  ],
+  "version": "3.0.17",
+  "_release": "3.0.17",
+  "_resolution": {
+    "type": "version",
+    "tag": "3.0.17",
+    "commit": "144040e4f545fbea9b304706a5200eba9961ee3f"
+  },
+  "_source": "https://github.com/jackmoore/autosize.git",
+  "_target": "^3.0.17",
+  "_originalSource": "autosize",
+  "_direct": true
+}

core/vendor/autosize/LICENSE.md

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Jack Moore
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.