diff options
| author | dave <starpumadev@gmail.com> | 2019-04-04 15:10:34 -0400 |
|---|---|---|
| committer | taehoon <th.dev91@gmail.com> | 2019-05-15 12:04:24 -0400 |
| commit | 2c89d49a3d22ed2813a6a57fb6049341fa8624ba (patch) | |
| tree | 4e7e97bdadc4a1aeeac28a8258c429a991efecb2 /src/components/timeline | |
| parent | e28b19645aa6a546f8d1980fa479f20d3c48ff36 (diff) | |
#468 - show pinned timeline and add pinned label to the status
Diffstat (limited to 'src/components/timeline')
| -rw-r--r-- | src/components/timeline/timeline.js | 3 | ||||
| -rw-r--r-- | src/components/timeline/timeline.vue | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 19d9a9ac..953b4a06 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -11,7 +11,8 @@ const Timeline = { 'userId', 'tag', 'embedded', - 'count' + 'count', + 'noLoadMore' ], data () { return { diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index e6a8d458..870fe4f5 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -21,11 +21,12 @@ class="status-fadein" :key="status.id" :statusoid="status" + :pinned="timelineName === 'pinned'" :collapsable="true" /> </div> </div> - <div :class="classes.footer"> + <div :class="classes.footer" v-if="!noLoadMore"> <div v-if="count===0" class="new-status-notification text-center panel-footer faint"> {{$t('timeline.no_statuses')}} </div> |