Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use statusOrConversation component in timeline.

Browse source
This commit is contained in:
Roger Braun 2017-02-04 13:53:16 +01:00
parent 800b051a16
commit b420b5838c
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/timeline/timeline.js
View file

@ -1,5 +1,6 @@
import Status from '../status/status.vue' import Status from '../status/status.vue'
import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js' import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js'
import StatusOrConversation from '../status_or_conversation/status_or_conversation.vue'
const Timeline = { const Timeline = {
props: [ props: [
@ -7,7 +8,8 @@ const Timeline = {
'timelineName' 'timelineName'
], ],
components: { components: {
Status Status,
StatusOrConversation
}, },
created () { created () {
const store = this.$store const store = this.$store

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

@ -7,7 +7,7 @@
</p> </p>
</div> </div>
</a> </a>
<status v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status> <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation>
<a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading"> <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading">
<div class="base01-background base05-border new-status-notification"> <div class="base01-background base05-border new-status-notification">
<p class="text-center" > <p class="text-center" >