From fc1736618b4e1a9f178c0ae287754c6ac1244b08 Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Tue, 21 Nov 2017 16:12:47 +0200
Subject: attempt to recognize when holes in timeline for various reasons,
 clear timeline and fetch older when showing new to get rid of holes

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

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

diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 0e2ed92c..365c8236 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -5,7 +5,7 @@
         {{title}}
       </div>
       <button @click.prevent="showNewStatuses" class="base05 base02-background loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError">
-        {{$t('timeline.show_new')}} ({{timeline.newStatusCount}})
+        {{$t('timeline.show_new')}}{{timeline.newStatusMsg}}
       </button>
       <div @click.prevent class="base06 error  loadmore-text" v-if="timelineError">
         {{$t('timeline.error_fetching')}}
-- 
cgit v1.2.3-70-g09d2


From 912be5aed9c8616d4c5772617ab4eef9a50d9061 Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Wed, 22 Nov 2017 00:47:20 +0200
Subject: Make the timeline button use the correct func for its text.

---
 src/components/timeline/timeline.js  | 2 +-
 src/components/timeline/timeline.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 9ef8406b..10ad4561 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -31,7 +31,7 @@ const Timeline = {
       return this.timeline.newStatusCount
     },
     newStatusCountStr () {
-      if (this.timeline.flushMarker) {
+      if (this.timeline.flushMarker > 0) {
         return ''
       } else {
         return ` (${this.newStatusCount})`
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 365c8236..9d2e1ea1 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -5,7 +5,7 @@
         {{title}}
       </div>
       <button @click.prevent="showNewStatuses" class="base05 base02-background loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError">
-        {{$t('timeline.show_new')}}{{timeline.newStatusMsg}}
+        {{$t('timeline.show_new')}}{{newStatusCountStr}}
       </button>
       <div @click.prevent class="base06 error  loadmore-text" v-if="timelineError">
         {{$t('timeline.error_fetching')}}
-- 
cgit v1.2.3-70-g09d2