Merge pull request #7266 from nextcloud/fix-input-field-not-disabled-while-a-comment-is-being-sent

Fix input field not disabled while a comment is being sent

2 files changed, 30 insertions, 5 deletions

diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index d64b70494fd..5767ecfc9da 100644
--- a/apps/comments/js/commentstabview.js
+++ b/apps/comments/js/commentstabview.js
@@ -321,7 +321,7 @@
 				this.$container.append($comment);
 			}
 			this._postRenderItem($comment);
-			$('#commentsTabView').find('.newCommentForm div.message').text('').prop('disabled', false);
+			$('#commentsTabView').find('.newCommentForm div.message').text('').prop('contenteditable', true);
 
 			// we need to update the model, because it consists of client data
 			// only, but the server might add meta data, e.g. about mentions
@@ -632,7 +632,7 @@
 				return;
 			}
 
-			$commentField.prop('disabled', true);
+			$commentField.prop('contenteditable', false);
 			$submit.addClass('hidden');
 			$loading.removeClass('hidden');
 
@@ -685,7 +685,7 @@
 		_onSubmitError: function($form, commentId) {
 			$form.find('.submit').removeClass('hidden');
 			$form.find('.submitLoading').addClass('hidden');
-			$form.find('.message').prop('disabled', false);
+			$form.find('.message').prop('contenteditable', true);
 
 			if(!_.isUndefined(commentId)) {
 				OC.Notification.show(t('comments', 'Error occurred while updating comment with id {id}', {id: commentId}), {type: 'error'});
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index 20e8cbf08e0..00e0e47f9a8 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -13,7 +13,7 @@
  */
 
  /* Specifically override browser styles */
-input, textarea, select, button, div[contenteditable=true] {
+input, textarea, select, button, div[contenteditable=true], div[contenteditable=false] {
 	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
 }
 .select2-container-multi .select2-choices .select2-search-field input, .select2-search input, .ui-widget {
@@ -25,7 +25,8 @@ select,
 button,
 input,
 textarea,
-div[contenteditable=true] {
+div[contenteditable=true],
+div[contenteditable=false] {
 	width: 130px;
 	min-height: 32px;
 	box-sizing: border-box;
@@ -88,6 +89,23 @@ div[contenteditable=true],
 	}
 }
 
+div[contenteditable=false] {
+	margin: 3px 3px 3px 0;
+	padding: 7px 6px;
+	font-size: 13px;
+	background-color: $color-main-background;
+	color: nc-lighten($color-main-text, 33%);
+	border: 1px solid nc-darken($color-main-background, 14%);
+	outline: none;
+	border-radius: $border-radius;
+	cursor: text;
+
+	background-color: nc-darken($color-main-background, 8%);
+	color: rgba($color-main-text, 0.4);
+	cursor: default;
+	opacity: 0.5;
+}
+
 /* Specific override */
 input {
 	&:not([type='radio']):not([type='checkbox']):not([type='range']):not([type='submit']):not([type='button']):not([type='reset']):not([type='color']):not([type='file']):not([type='image']) {
@@ -171,6 +189,13 @@ textarea, div[contenteditable=true] {
 	}
 }
 
+div[contenteditable=false] {
+	color: nc-lighten($color-main-text, 33%);
+	cursor: text;
+	font-family: inherit;
+	height: auto;
+}
+
 /* Override the ugly select arrow */
 select {
 	-webkit-appearance: none;