diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2020-07-28 09:40:04 +0300 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2020-07-28 09:40:04 +0300 |
| commit | e86c5ea1fa7dcbae582707430a821d2197576f7b (patch) | |
| tree | de7c23a2fe374eed5565a95eb1c39019fecb157d | |
| parent | fdbacba36a99b1f2ef200b8194a1964d9b87f9e1 (diff) | |
fix non-timeline routes breaking current/previous timeline
| -rw-r--r-- | src/components/timeline/timeline.vue | 2 | ||||
| -rw-r--r-- | src/components/timeline_menu/timeline_menu.js | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index c637dbd4..9eed10f6 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -1,7 +1,7 @@ <template> <div :class="classes.root"> <div :class="classes.header"> - <TimelineMenu /> + <TimelineMenu v-if="!embedded" /> <div v-if="timelineError" class="loadmore-error alert error" diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js index 0afeb8b4..fcc7b4ef 100644 --- a/src/components/timeline_menu/timeline_menu.js +++ b/src/components/timeline_menu/timeline_menu.js @@ -26,7 +26,9 @@ const TimelineMenu = { if (this.currentUser && this.currentUser.locked) { this.$store.dispatch('startFetchingFollowRequests') } - this.$store.dispatch('setLastTimeline', this.$route.name) + if (timelineNames().includes(this.$route.name)) { + this.$store.dispatch('setLastTimeline', this.$route.name) + } }, methods: { openMenu () { |