pleroma-fe

commit: aeda390da0ef99a8fda9f059cf4d8168aa1938c2
parent: 5997492795d5cf2d0f575c65e87991348297cdf6
Author: Shpuld Shpuldson <shpuld@gmail.com>
Date:   Wed,  8 Mar 2017 19:03:06 -0500

Merge branch 'feature/timeline-fetch-error' into 'develop'

Move rejection handler

See merge request !48
Diffstat:
M
src/services/timeline_fetcher/timeline_fetcher.service.js
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -5,6 +5,8 @@ import apiService from '../api/api.service.js'
 const update = ({store, statuses, timeline, showImmediately}) => {
   const ccTimeline = camelCase(timeline)
 
+  setError({store, timeline, value: false})
+
   store.dispatch('addNewStatuses', {
     timeline: ccTimeline,
     statuses,
@@ -33,9 +35,8 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false
   }
 
   return apiService.fetchTimeline(args)
-    .then((statuses) => update({store, statuses, timeline, showImmediately}))
-    .then(() => setError({store, timeline, value: false}))
-    .catch(() => setError({store, timeline, value: true}))
+    .then((statuses) => update({store, statuses, timeline, showImmediately}),
+      () => setError({store, timeline, value: true}))
 }
 
 const startFetching = ({ timeline = 'friends', credentials, store }) => {