about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-11-12 04:51:07 +0100
committerYamagishi Kazutoshi <ykzts@desire.sh>2017-11-12 12:51:07 +0900
commit07f7192bc3573b1fe5ec7545d7bc08f65c16178b (patch)
treebf8a827fd9ebc78c3195219675ee238c9f7b8030
parentfcb9533549e2f686af2ce9ef64c4bb6b639b9391 (diff)
Fix #5632 - Reset column loading status after fetch fail (#5659)
-rw-r--r--app/javascript/mastodon/reducers/notifications.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index cccf00a1f..264db4f55 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -99,9 +99,10 @@ export default function notifications(state = initialState, action) {
   switch(action.type) {
   case NOTIFICATIONS_REFRESH_REQUEST:
   case NOTIFICATIONS_EXPAND_REQUEST:
+    return state.set('isLoading', true);
   case NOTIFICATIONS_REFRESH_FAIL:
   case NOTIFICATIONS_EXPAND_FAIL:
-    return state.set('isLoading', true);
+    return state.set('isLoading', false);
   case NOTIFICATIONS_SCROLL_TOP:
     return updateTop(state, action.top);
   case NOTIFICATIONS_UPDATE: