From 3d30ad1dda8f31960586625bb6a432d6b3adde8e Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Sun, 3 Mar 2019 12:53:01 -0500
Subject: #417: refresh tab on user profile only

---
 src/components/user_profile/user_profile.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components/user_profile/user_profile.vue')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index a3d2825f..54f1b97b 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -6,7 +6,7 @@
       :switcher="true"
       :selected="timeline.viewing"
     />
-    <tab-switcher :renderOnlyFocused="true">
+    <tab-switcher :refresh="true" :renderOnlyFocused="true">
       <Timeline
         :label="$t('user_card.statuses')"
         :disabled="!user.statuses_count"
-- 
cgit v1.2.3-70-g09d2


From 5a0bb29f02349aed4a7948b963ff0a78d3975237 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Sun, 3 Mar 2019 13:38:48 -0500
Subject: #417: reset tab from the outside

---
 src/components/tab_switcher/tab_switcher.js  | 9 +--------
 src/components/user_profile/user_profile.js  | 3 +++
 src/components/user_profile/user_profile.vue | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/components/user_profile/user_profile.vue')

diff --git a/src/components/tab_switcher/tab_switcher.js b/src/components/tab_switcher/tab_switcher.js
index 03da8249..423df258 100644
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@@ -4,19 +4,12 @@ import './tab_switcher.scss'
 
 export default Vue.component('tab-switcher', {
   name: 'TabSwitcher',
-  props: ['refresh', 'renderOnlyFocused'],
+  props: ['renderOnlyFocused'],
   data () {
     return {
       active: this.$slots.default.findIndex(_ => _.tag)
     }
   },
-  watch: {
-    $route () {
-      if (this.refresh) {
-        this.active = 0
-      }
-    }
-  },
   methods: {
     activateTab (index) {
       return () => {
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 7708141c..cdf1cee9 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -141,6 +141,9 @@ const UserProfile = {
       }
       this.cleanUp()
       this.startUp()
+    },
+    $route () {
+      this.$refs.tabSwitcher.activateTab(0)()
     }
   },
   components: {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 54f1b97b..8090efa5 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -6,7 +6,7 @@
       :switcher="true"
       :selected="timeline.viewing"
     />
-    <tab-switcher :refresh="true" :renderOnlyFocused="true">
+    <tab-switcher :renderOnlyFocused="true" ref="tabSwitcher">
       <Timeline
         :label="$t('user_card.statuses')"
         :disabled="!user.statuses_count"
-- 
cgit v1.2.3-70-g09d2

