about summary refs log tree commit diff
path: root/app/javascript/mastodon/actions/timelines.js
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-05-04 23:41:34 +0200
committerGitHub <noreply@github.com>2017-05-04 23:41:34 +0200
commiteddb95b0126e523faeafbde544ff5df3a64e5b25 (patch)
treebc24f9595b33c9b621886a7d6ab1a3233ac69b3e /app/javascript/mastodon/actions/timelines.js
parent84eb425f385c5fc66dc67973b2869b9f31e9a2bb (diff)
When streaming API is disconnected, poll home/notifications (#2776)
* When streaming API is disconnected, poll home/notifications
Display slightly different empty home timeline message if user is following others
Cull notifications to 20 items when over 40 get added in real-time
Run manage:translations

* Optimize <HomeTimeline /> a little
Diffstat (limited to 'app/javascript/mastodon/actions/timelines.js')
-rw-r--r--app/javascript/mastodon/actions/timelines.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 6cd1f04b3..5b37509a9 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -86,6 +86,8 @@ export function refreshTimeline(timeline, id = null) {
 
       params          = { ...params, since_id: newestId };
       skipLoading     = true;
+    } else if (getState().getIn(['timelines', timeline, 'loaded'])) {
+      skipLoading = true;
     }
 
     dispatch(refreshTimelineRequest(timeline, id, skipLoading));