Page MenuHomePhorge
Files F85827051

No OneTemporary
Actions

Authored By
Unknown
Size
6 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/components/friends_timeline/friends_timeline.vue b/src/components/friends_timeline/friends_timeline.vue
index af8ba5fee5..f443c20772 100644
--- a/src/components/friends_timeline/friends_timeline.vue
+++ b/src/components/friends_timeline/friends_timeline.vue
@@ -1,10 +1,5 @@
<template>
- <div class="timeline panel panel-default">
- <div class="panel-heading">Friends Timeline</div>
- <div class="panel-body">
- <Timeline v-bind:timeline="timeline" v-bind:timeline-name="'friends'"/>
- </div>
- </div>
+ <Timeline :timeline="timeline" :timeline-display-name="'Friends Timeline'" :timeline-name="'friends'"/>
</template>
<script src="./friends_timeline.js"></script>
diff --git a/src/components/mentions/mentions.vue b/src/components/mentions/mentions.vue
index 6287ca117b..2c10d38b91 100644
--- a/src/components/mentions/mentions.vue
+++ b/src/components/mentions/mentions.vue
@@ -1,10 +1,5 @@
<template>
- <div class="timeline panel panel-default">
- <div class="panel-heading">Mentions</div>
- <div class="panel-body">
- <Timeline v-bind:timeline="timeline" v-bind:timeline-name="'mentions'"/>
- </div>
- </div>
+ <Timeline :timeline="timeline" :timeline-display-name="'Mentions'" :timeline-name="'mentions'"/>
</template>
<script src="./mentions.js"></script>
diff --git a/src/components/public_and_external_timeline/public_and_external_timeline.vue b/src/components/public_and_external_timeline/public_and_external_timeline.vue
index 94cdaf17fb..7024172538 100644
--- a/src/components/public_and_external_timeline/public_and_external_timeline.vue
+++ b/src/components/public_and_external_timeline/public_and_external_timeline.vue
@@ -1,10 +1,5 @@
<template>
- <div class="timeline panel panel-default">
- <div class="panel-heading">THE WHOLE KNOWN NETWORK</div>
- <div class="panel-body">
- <Timeline v-bind:timeline="timeline" v-bind:timeline-name="'publicAndExternal'"/>
- </div>
- </div>
+ <Timeline :timeline="timeline" :timeline-display-name="'THE WHOLE KNOWN NETWORK'" :timeline-name="'publicAndExternal'"/>
</template>
<script src="./public_and_external_timeline.js"></script>
diff --git a/src/components/public_timeline/public_timeline.vue b/src/components/public_timeline/public_timeline.vue
index 22a2a2b8fc..a003dfedeb 100644
--- a/src/components/public_timeline/public_timeline.vue
+++ b/src/components/public_timeline/public_timeline.vue
@@ -1,10 +1,5 @@
<template>
- <div class="timeline panel panel-default">
- <div class="panel-heading">Public Timeline</div>
- <div class="panel-body">
- <Timeline v-bind:timeline="timeline" v-bind:timeline-name="'public'"/>
- </div>
- </div>
+ <Timeline :timeline="timeline" :timeline-display-name="'Public Timeline'" :timeline-name="'public'"/>
</template>
<script src="./public_timeline.js"></script>
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 8799e69c7a..db0a1c051f 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -1,43 +1,44 @@
import Status from '../status/status.vue'
import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js'
const Timeline = {
props: [
'timeline',
- 'timelineName'
+ 'timelineName',
+ 'timelineDisplayName'
],
components: {
Status
},
created () {
const store = this.$store
const credentials = store.state.users.currentUser.credentials
const showImmediately = this.timeline.visibleStatuses.length === 0
timelineFetcher.fetchAndUpdate({
store,
credentials,
timeline: this.timelineName,
showImmediately
})
},
methods: {
showNewStatuses () {
this.$store.commit('showNewStatuses', { timeline: this.timelineName })
},
fetchOlderStatuses () {
const store = this.$store
const credentials = store.state.users.currentUser.credentials
store.commit('setLoading', { timeline: this.timelineName, value: true })
timelineFetcher.fetchAndUpdate({
store,
credentials,
timeline: this.timelineName,
older: true,
showImmediately: true
}).then(() => store.commit('setLoading', { timeline: this.timelineName, value: false }))
}
}
}
export default Timeline
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 7de3ffcace..cae2046a37 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -1,20 +1,27 @@
<template>
- <div class="timeline">
- <a href="#" v-on:click.prevent='showNewStatuses()' v-if="timeline.newStatusCount > 0">
- <div class="new-status-notification">
- <p class="text-center" >
- {{timeline.newStatusCount}} new statuses
- </p>
+ <div class="timeline panel panel-default">
+ <div class="panel-heading">
+ <p>{{timelineDisplayName}}<i class='icon-retweet fa' @click.prevent='showNewStatuses()'></i></p>
+ </div>
+ <div class="panel-body">
+ <div class="timeline">
+ <a href="#" @click.prevent='showNewStatuses()' v-if="timeline.newStatusCount > 0">
+ <div class="new-status-notification">
+ <p class="text-center" >
+ {{timeline.newStatusCount}} new statuses
+ </p>
+ </div>
+ </a>
+ <status v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status>
+ <a href="#" @click.prevent='fetchOlderStatuses()' v-if="!timeline.loading">
+ <div class="new-status-notification">
+ <p class="text-center" >
+ Load older statuses.
+ </p>
+ </div>
+ </a>
</div>
- </a>
- <status v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status>
- <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading">
- <div class="new-status-notification">
- <p class="text-center" >
- Load older statuses.
- </p>
- </div>
- </a>
+ </div>
</div>
</template>
<script src="./timeline.js"></script>

File Metadata

Mime Type
text/x-diff
Expires
Fri, Oct 30, 1:49 PM (18 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1800182
Default Alt Text
(6 KB)

Event Timeline