Merge pull request #864 from Human-Connection/844-Comments-cannot-be-expanded-if-they-are-too-long

🐛 [Bug] :  long comments can be folded up and down
This commit is contained in:
Alexander Friedland 2019-07-03 10:52:19 +02:00 committed by GitHub
commit 324330ad8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 4 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@ cypress.env.json
!.gitkeep
**/coverage

View File

@ -11,7 +11,6 @@
</div>
<div v-else :class="{ comment: true, 'disabled-content': comment.deleted || comment.disabled }">
<ds-card>
<ds-space margin-bottom="small" />
<ds-space margin-bottom="small">
<hc-user :user="author" :date-time="comment.createdAt" />
</ds-space>
@ -28,13 +27,27 @@
</no-ssr>
<!-- eslint-disable vue/no-v-html -->
<!-- TODO: replace editor content with tiptap render view -->
<div v-if="isCollapsed" v-html="comment.contentExcerpt" style="padding-left: 40px;" />
<div
v-show="comment.content !== comment.contentExcerpt"
style="text-align: right; margin-right: 20px; margin-top: -12px;"
>
<a v-if="isCollapsed" style="padding-left: 40px;" @click="isCollapsed = !isCollapsed">
{{ $t('comment.show.more') }}
</a>
</div>
<div v-if="!isCollapsed" v-html="comment.content" style="padding-left: 40px;" />
<div style="text-align: right; margin-right: 20px; margin-top: -12px;">
<a v-if="!isCollapsed" @click="isCollapsed = !isCollapsed" style="padding-left: 40px; ">
{{ $t('comment.show.less') }}
</a>
</div>
<ds-space margin-bottom="small" />
<div style="padding-left: 40px;" v-html="comment.contentExcerpt" />
<!-- eslint-enable vue/no-v-html -->
<ds-space margin-bottom="x-small" />
</ds-card>
</div>
</template>
<!-- eslint-enable vue/no-v-html -->
<script>
import gql from 'graphql-tag'
@ -43,6 +56,11 @@ import HcUser from '~/components/User'
import ContentMenu from '~/components/ContentMenu'
export default {
data: function() {
return {
isCollapsed: true,
}
},
components: {
HcUser,
ContentMenu,

View File

@ -7,6 +7,7 @@ export default () => {
CreateComment(postId: $postId, content: $content) {
id
contentExcerpt
content
author {
id
slug

View File

@ -8,6 +8,7 @@ export default i18n => {
comments(orderBy: createdAt_asc) {
id
contentExcerpt
content
createdAt
disabled
deleted

View File

@ -190,6 +190,10 @@
"menu": {
"edit": "Kommentar bearbeiten",
"delete": "Kommentar löschen"
},
"show": {
"more": "mehr anzeigen",
"less": "weniger anzeigen"
}
},
"quotes": {

View File

@ -190,7 +190,12 @@
"menu": {
"edit": "Edit Comment",
"delete": "Delete Comment"
},
"show": {
"more": "show more",
"less": "show less"
}
},
"quotes": {
"african": {