sjw/pleroma-fe
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma-fe.git synced 2024-11-11 00:19:17 +01:00
Code Issues Releases Wiki Activity

show pinned state only in the user timeline

Browse Source
This commit is contained in:
taehoon 2019-04-30 11:06:22 -04:00
parent 110c9d3b26
commit f68653d0dd
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/conversation/conversation.js
View File

@ -41,7 +41,8 @@ const conversation = {
props: [ props: [
'statusoid', 'statusoid',
'collapsable', 'collapsable',
'isPage' 'isPage',
'showPinned'
], ],
created () { created () {
if (this.isPage) { if (this.isPage) {

1
src/components/conversation/conversation.vue
View File

@ -14,6 +14,7 @@
:inlineExpanded="collapsable && isExpanded" :inlineExpanded="collapsable && isExpanded"
:statusoid="status" :statusoid="status"
:expandable='!isExpanded' :expandable='!isExpanded'
:showPinned="showPinned"
:focused="focused(status.id)" :focused="focused(status.id)"
:inConversation="isExpanded" :inConversation="isExpanded"
:highlight="getHighlight()" :highlight="getHighlight()"

3
src/components/status/status.js
View File

@ -26,7 +26,8 @@ const Status = {
'replies', 'replies',
'isPreview', 'isPreview',
'noHeading', 'noHeading',
'inlineExpanded' 'inlineExpanded',
'showPinned'
], ],
data () { data () {
return { return {

2
src/components/status/status.vue
View File

@ -16,7 +16,7 @@
</div> </div>
</template> </template>
<template v-else> <template v-else>
<div v-if="statusoid.pinned" class="status-pin"> <div v-if="showPinned && statusoid.pinned" class="status-pin">
<i class="fa icon-pin faint"></i> <i class="fa icon-pin faint"></i>
<span class="faint">{{$t('status.pinned')}}</span> <span class="faint">{{$t('status.pinned')}}</span>
</div> </div>

1
src/components/user_profile/user_profile.vue
View File

@ -12,6 +12,7 @@
:key="statusId" :key="statusId"
:statusoid="timeline.statusesObject[statusId]" :statusoid="timeline.statusesObject[statusId]"
:collapsable="true" :collapsable="true"
:showPinned="true"
/> />
</template> </template>
</div> </div>