aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/components/timeline/timeline.vue2
-rw-r--r--src/components/timeline_menu/timeline_menu.js4
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 () {