From 642b0be0b2c82e7c9c1bb45c50e60b2d3b4090f8 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Sun, 17 Feb 2019 14:31:13 -0700
Subject: Bind a keyboard to show new status

---
 src/components/timeline/timeline.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/components/timeline')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 85e0a055..a8a3495a 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -67,6 +67,9 @@ const Timeline = {
       document.addEventListener('visibilitychange', this.handleVisibilityChange, false)
       this.unfocused = document.hidden
     }
+    window.addEventListener('keydown', e => {
+      if (e.key === '.') this.showNewStatuses()
+    })
   },
   destroyed () {
     window.removeEventListener('scroll', this.scrollLoad)
-- 
cgit v1.2.3-70-g09d2


From 0d2922afb3bcfcdcc439f158d147db1f08d995c7 Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Sun, 17 Feb 2019 14:37:24 -0700
Subject: Remove event listener when component destroy

---
 src/components/timeline/timeline.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/components/timeline')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index a8a3495a..d7f7029e 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -67,16 +67,18 @@ const Timeline = {
       document.addEventListener('visibilitychange', this.handleVisibilityChange, false)
       this.unfocused = document.hidden
     }
-    window.addEventListener('keydown', e => {
-      if (e.key === '.') this.showNewStatuses()
-    })
+    window.addEventListener('keydown', this.handleShortKey)
   },
   destroyed () {
     window.removeEventListener('scroll', this.scrollLoad)
+    window.removeEventListener('keydown', this.handleShortKey)
     if (typeof document.hidden !== 'undefined') document.removeEventListener('visibilitychange', this.handleVisibilityChange, false)
     this.$store.commit('setLoading', { timeline: this.timelineName, value: false })
   },
   methods: {
+    handleShortKey (e) {
+      if (e.key === '.') this.showNewStatuses()
+    },
     showNewStatuses () {
       if (this.timeline.flushMarker !== 0) {
         this.$store.commit('clearTimeline', { timeline: this.timelineName })
-- 
cgit v1.2.3-70-g09d2


From d4a2376e12cd9a05e29bf8eb55d7388598ed1137 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Mon, 18 Feb 2019 12:32:08 -0800
Subject: fix/fetch-error-when-login

---
 src/components/timeline/timeline.js | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'src/components/timeline')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 85e0a055..40b42d50 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -47,20 +47,7 @@ const Timeline = {
     UserCard
   },
   created () {
-    const store = this.$store
-    const credentials = store.state.users.currentUser.credentials
-    const showImmediately = this.timeline.visibleStatuses.length === 0
-
     window.addEventListener('scroll', this.scrollLoad)
-
-    timelineFetcher.fetchAndUpdate({
-      store,
-      credentials,
-      timeline: this.timelineName,
-      showImmediately,
-      userId: this.userId,
-      tag: this.tag
-    })
   },
   mounted () {
     if (typeof document.hidden !== 'undefined') {
-- 
cgit v1.2.3-70-g09d2


From b4709515f22446b032c664e0960419ebea119098 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Mon, 18 Feb 2019 17:15:16 -0800
Subject: Fix error when login

---
 src/components/timeline/timeline.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/components/timeline')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 40b42d50..3fc927f9 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -47,7 +47,22 @@ const Timeline = {
     UserCard
   },
   created () {
+    const store = this.$store
+    const credentials = store.state.users.currentUser.credentials
+    const showImmediately = this.timeline.visibleStatuses.length === 0
+
     window.addEventListener('scroll', this.scrollLoad)
+
+    if (typeof credentials !== 'undefined' || this.timelineName !== 'friends') {
+      timelineFetcher.fetchAndUpdate({
+        store,
+        credentials,
+        timeline: this.timelineName,
+        showImmediately,
+        userId: this.userId,
+        tag: this.tag
+      })
+    }
   },
   mounted () {
     if (typeof document.hidden !== 'undefined') {
-- 
cgit v1.2.3-70-g09d2


From d032ce2758cb57ea34e1fea2d1804656965b635e Mon Sep 17 00:00:00 2001
From: Edijs <iamedijs@hotmail.com>
Date: Mon, 18 Feb 2019 18:32:20 -0700
Subject: Validate if there are any new status to show

---
 src/components/timeline/timeline.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/components/timeline')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index d7f7029e..06832898 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -80,6 +80,8 @@ const Timeline = {
       if (e.key === '.') this.showNewStatuses()
     },
     showNewStatuses () {
+      if (this.newStatusCount === 0) return
+
       if (this.timeline.flushMarker !== 0) {
         this.$store.commit('clearTimeline', { timeline: this.timelineName })
         this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 })
-- 
cgit v1.2.3-70-g09d2


From 1e43a47c3c922c4b68e0a84b74cafe6a2ea23bf1 Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Tue, 19 Feb 2019 09:42:53 -0800
Subject: Update: Fix fetch error when login

---
 src/components/timeline/timeline.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/components/timeline')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 3fc927f9..ee4ec10b 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -53,16 +53,16 @@ const Timeline = {
 
     window.addEventListener('scroll', this.scrollLoad)
 
-    if (typeof credentials !== 'undefined' || this.timelineName !== 'friends') {
-      timelineFetcher.fetchAndUpdate({
-        store,
-        credentials,
-        timeline: this.timelineName,
-        showImmediately,
-        userId: this.userId,
-        tag: this.tag
-      })
-    }
+    if (this.timelineName === 'friends' && !credentials) { return false }
+
+    timelineFetcher.fetchAndUpdate({
+      store,
+      credentials,
+      timeline: this.timelineName,
+      showImmediately,
+      userId: this.userId,
+      tag: this.tag
+    })
   },
   mounted () {
     if (typeof document.hidden !== 'undefined') {
-- 
cgit v1.2.3-70-g09d2


From e20a7be3aa4973400cd670347ff038a78eb12e4e Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Wed, 20 Feb 2019 10:13:28 -0500
Subject: #376: update status timeline when it's empty

---
 src/components/timeline/timeline.js          | 3 ++-
 src/components/timeline/timeline.vue         | 5 ++++-
 src/components/user_profile/user_profile.vue | 1 +
 src/i18n/en.json                             | 3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/components/timeline')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 85e0a055..40226674 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -11,7 +11,8 @@ const Timeline = {
     'title',
     'userId',
     'tag',
-    'embedded'
+    'embedded',
+    'count'
   ],
   data () {
     return {
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index e3eea3bd..8f28d65c 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -20,7 +20,10 @@
       </div>
     </div>
     <div :class="classes.footer">
-      <div v-if="bottomedOut" class="new-status-notification text-center panel-footer faint">
+      <div v-if="count===0" class="new-status-notification text-center panel-footer faint">
+        {{$t('timeline.no_statuses')}}
+      </div>
+      <div v-else-if="bottomedOut" class="new-status-notification text-center panel-footer faint">
         {{$t('timeline.no_more_statuses')}}
       </div>
       <a v-else-if="!timeline.loading" href="#" v-on:click.prevent='fetchOlderStatuses()'>
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 79461291..09fb93de 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -10,6 +10,7 @@
       <Timeline
         :label="$t('user_card.statuses')"
         :disabled="!user.statuses_count"
+        :count="user.statuses_count"
         :embedded="true"
         :title="$t('user_profile.timeline_title')"
         :timeline="timeline"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 78e8fced..cf838bae 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -342,7 +342,8 @@
     "repeated": "repeated",
     "show_new": "Show new",
     "up_to_date": "Up-to-date",
-    "no_more_statuses": "No more statuses"
+    "no_more_statuses": "No more statuses",
+    "no_statuses": "No statuses"
   },
   "user_card": {
     "approve": "Approve",
-- 
cgit v1.2.3-70-g09d2


From 3ab42efbc3534c732446f8ee1b8cb9fef4bf7f69 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 25 Feb 2019 16:30:45 -0500
Subject: Remove unused component local registration

---
 src/components/timeline/timeline.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/components/timeline')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 62536bc5..d986663e 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -1,7 +1,6 @@
 import Status from '../status/status.vue'
 import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js'
 import StatusOrConversation from '../status_or_conversation/status_or_conversation.vue'
-import UserCard from '../user_card/user_card.vue'
 import { throttle } from 'lodash'
 
 const Timeline = {
@@ -44,8 +43,7 @@ const Timeline = {
   },
   components: {
     Status,
-    StatusOrConversation,
-    UserCard
+    StatusOrConversation
   },
   created () {
     const store = this.$store
-- 
cgit v1.2.3-70-g09d2


From 068da3cf9f22f83da17051b8db5cde597f624fdf Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Sat, 2 Mar 2019 14:57:41 +0200
Subject: Fix JS error when no statuses returned

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

(limited to 'src/components/timeline')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index d986663e..655bfb3f 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -106,7 +106,7 @@ const Timeline = {
         tag: this.tag
       }).then(statuses => {
         store.commit('setLoading', { timeline: this.timelineName, value: false })
-        if (statuses.length === 0) {
+        if (statuses && statuses.length === 0) {
           this.bottomedOut = true
         }
       })
-- 
cgit v1.2.3-70-g09d2