about summary refs log tree commit diff
path: root/app/assets/javascripts/components/actions
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/components/actions')
-rw-r--r--app/assets/javascripts/components/actions/timelines.jsx9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/components/actions/timelines.jsx b/app/assets/javascripts/components/actions/timelines.jsx
index 29a060e87..1531b89a3 100644
--- a/app/assets/javascripts/components/actions/timelines.jsx
+++ b/app/assets/javascripts/components/actions/timelines.jsx
@@ -74,7 +74,7 @@ export function refreshTimeline(timeline, id = null) {
     let path        = timeline;
     let skipLoading = false;
 
-    if (newestId !== null && getState().getIn(['timelines', timeline, 'loaded'])) {
+    if (newestId !== null && getState().getIn(['timelines', timeline, 'loaded']) && (id === null || getState().getIn(['timelines', timeline, 'id']) === id)) {
       params      = `?since_id=${newestId}`;
       skipLoading = true;
     }
@@ -112,7 +112,7 @@ export function expandTimeline(timeline, id = null) {
       return;
     }
 
-    dispatch(expandTimelineRequest(timeline));
+    dispatch(expandTimelineRequest(timeline, id));
 
     let path = timeline;
 
@@ -133,10 +133,11 @@ export function expandTimeline(timeline, id = null) {
   };
 };
 
-export function expandTimelineRequest(timeline) {
+export function expandTimelineRequest(timeline, id) {
   return {
     type: TIMELINE_EXPAND_REQUEST,
-    timeline
+    timeline,
+    id
   };
 };