aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoreal <eal@waifu.club>2018-11-25 19:00:24 +0200
committereal <eal@waifu.club>2018-11-25 19:00:24 +0200
commit668087a29e9b50e6c74dae0037ea18999eb03ea6 (patch)
treec334ac2746516ccbb275e60281a97441b3a932f0 /src
parent3263aa323c8b1bfa6375251eca66d9de6956a1d6 (diff)
Switch to timeline on nav panel actions
Diffstat (limited to 'src')
-rw-r--r--src/App.vue2
-rw-r--r--src/components/nav_panel/nav_panel.js1
-rw-r--r--src/components/nav_panel/nav_panel.vue12
3 files changed, 8 insertions, 7 deletions
diff --git a/src/App.vue b/src/App.vue
index 059460f9..37bcdcac 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,7 +26,7 @@
<div class="sidebar-scroller">
<div class="sidebar">
<user-panel></user-panel>
- <nav-panel></nav-panel>
+ <nav-panel :activatePanel="activatePanel"></nav-panel>
<instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-panel>
<features-panel v-if="!currentUser"></features-panel>
<who-to-follow-panel v-if="currentUser && suggestionsEnabled"></who-to-follow-panel>
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index ea5d7ea4..19ce56c3 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -1,4 +1,5 @@
const NavPanel = {
+ props: [ 'activatePanel' ],
computed: {
currentUser () {
return this.$store.state.users.currentUser
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 93deaf97..b224c5f3 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -3,32 +3,32 @@
<div class="panel panel-default">
<ul>
<li v-if='currentUser'>
- <router-link to='/main/friends'>
+ <router-link @click.native="activatePanel('timeline')" to='/main/friends'>
{{ $t("nav.timeline") }}
</router-link>
</li>
<li v-if='currentUser'>
- <router-link :to="{ name: 'mentions', params: { username: currentUser.screen_name } }">
+ <router-link @click.native="activatePanel('timeline')" :to="{ name: 'mentions', params: { username: currentUser.screen_name } }">
{{ $t("nav.mentions") }}
</router-link>
</li>
<li v-if='currentUser'>
- <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }">
+ <router-link @click.native="activatePanel('timeline')" :to="{ name: 'dms', params: { username: currentUser.screen_name } }">
{{ $t("nav.dms") }}
</router-link>
</li>
<li v-if='currentUser && currentUser.locked'>
- <router-link to='/friend-requests'>
+ <router-link @click.native="activatePanel('timeline')" to='/friend-requests'>
{{ $t("nav.friend_requests") }}
</router-link>
</li>
<li>
- <router-link to='/main/public'>
+ <router-link @click.native="activatePanel('timeline')" to='/main/public'>
{{ $t("nav.public_tl") }}
</router-link>
</li>
<li>
- <router-link to='/main/all'>
+ <router-link @click.native="activatePanel('timeline')" to='/main/all'>
{{ $t("nav.twkn") }}
</router-link>
</li>