mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Morris Jobke 2017-11-27 13:40:03 +01:00 committed by GitHub
parent e02229e412 b248c53c6a
commit cfae590ac9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/comments/js/commentstabview.js
View File

@ -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'});

29
core/css/inputs.scss
View File

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