darkkirb/akkoma-fe
1
0
Fork 0
forked from mirrors/akkoma-fe
Code Pull requests Activity

use pinned property from status directly

Browse source
This commit is contained in:
taehoon 2019-04-26 15:46:40 -04:00
parent f8186bfc74
commit 32be0e15d1
5 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -13,7 +13,6 @@
:key="status.id" :key="status.id"
:inlineExpanded="collapsable && isExpanded" :inlineExpanded="collapsable && isExpanded"
:statusoid="status" :statusoid="status"
:pinned="pinned"
:expandable='!isExpanded' :expandable='!isExpanded'
:focused="focused(status.id)" :focused="focused(status.id)"
:inConversation="isExpanded" :inConversation="isExpanded"

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

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

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

@ -13,7 +13,7 @@
</div> </div>
</template> </template>
<template v-else> <template v-else>
<div v-if="pinned" class="status-pin"> <div v-if="statusoid.pinned" class="status-pin">
<i class="fa icon-pin faint"></i> <i class="fa icon-pin faint"></i>
<span class="faint">Pinned</span> <span class="faint">Pinned</span>
</div> </div>

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

@ -10,7 +10,6 @@
class="status-fadein" class="status-fadein"
:key="status.id" :key="status.id"
:statusoid="status" :statusoid="status"
:pinned="true"
:collapsable="true" :collapsable="true"
/> />
</div> </div>