diff options
| author | taehoon <th.dev91@gmail.com> | 2019-04-30 11:06:22 -0400 |
|---|---|---|
| committer | taehoon <th.dev91@gmail.com> | 2019-05-15 12:04:26 -0400 |
| commit | f68653d0dd0b374aa28eca35b424b6c834c701d6 (patch) | |
| tree | 5ff6bd3a6849c704dfe47eae43748e9a473e5f4b /src | |
| parent | 110c9d3b26e3871c8fc8157458be201ed4316d49 (diff) | |
show pinned state only in the user timeline
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/conversation/conversation.js | 3 | ||||
| -rw-r--r-- | src/components/conversation/conversation.vue | 1 | ||||
| -rw-r--r-- | src/components/status/status.js | 3 | ||||
| -rw-r--r-- | src/components/status/status.vue | 2 | ||||
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 1 |
5 files changed, 7 insertions, 3 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index ffeb7244..b3074590 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -41,7 +41,8 @@ const conversation = { props: [ 'statusoid', 'collapsable', - 'isPage' + 'isPage', + 'showPinned' ], created () { if (this.isPage) { diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index d04ff722..0b4998c3 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -14,6 +14,7 @@ :inlineExpanded="collapsable && isExpanded" :statusoid="status" :expandable='!isExpanded' + :showPinned="showPinned" :focused="focused(status.id)" :inConversation="isExpanded" :highlight="getHighlight()" diff --git a/src/components/status/status.js b/src/components/status/status.js index a1ffb026..5b3d98c3 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -26,7 +26,8 @@ const Status = { 'replies', 'isPreview', 'noHeading', - 'inlineExpanded' + 'inlineExpanded', + 'showPinned' ], data () { return { diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 8575a95e..997c1b31 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -16,7 +16,7 @@ </div> </template> <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> <span class="faint">{{$t('status.pinned')}}</span> </div> diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 36d75b9e..48b774ea 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -12,6 +12,7 @@ :key="statusId" :statusoid="timeline.statusesObject[statusId]" :collapsable="true" + :showPinned="true" /> </template> </div> |