IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1476 from Human-Connection/1393-fix-show-less-bugginess

Browse Source 
1393 fix show less bugginess
This commit is contained in:
Wolfgang Huß 2019-09-05 08:44:40 +02:00 committed by GitHub
commit 016e60b14c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webapp/components/Comment.spec.js
View File

@ -63,6 +63,7 @@ describe('Comment.vue', () => {
propsData.comment = {
id: '2',
contentExcerpt: 'Hello I am a comment content',
content: 'Hello I am comment content',
}
})

8
webapp/components/Comment.vue
View File

@ -38,18 +38,14 @@
<div v-show="!openEditCommentMenu">
<div v-if="isCollapsed" v-html="comment.contentExcerpt" style="padding-left: 40px;" />
<div
v-show="comment.content !== comment.contentExcerpt"
v-show="comment.content !== comment.contentExcerpt && comment.content.length > 180"
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>
<content-viewer
v-if="!isCollapsed"
:content="comment.content"
style="padding-left: 40px;"
/>
<content-viewer 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') }}

4
webapp/components/CommentList/CommentList.spec.js
View File

@ -27,7 +27,9 @@ describe('CommentList.vue', () => {
propsData = {
post: {
id: 1,
comments: [{ id: 'comment134', contentExcerpt: 'this is a comment' }],
comments: [
{ id: 'comment134', contentExcerpt: 'this is a comment', content: 'this is a comment' },
],
},
}
store = new Vuex.Store({