about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorRakib Hasan <rmhasan@gmail.com>2017-02-19 07:32:35 +0000
committerRakib Hasan <rmhasan@gmail.com>2017-02-19 08:21:05 +0000
commit9e0dbb73377588653f6586d9bb236b19aba222e2 (patch)
tree2000ba7419636c78d0f885dd60754d16e9c465e2 /app
parent9e99b8c068b11ec2d0f3b5d560cae0166c247342 (diff)
Fixing issue #626
The status is not showing anymore after clicking on it
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/components/actions/statuses.jsx4
-rw-r--r--app/assets/javascripts/components/features/status/index.jsx2
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/components/actions/statuses.jsx b/app/assets/javascripts/components/actions/statuses.jsx
index ee662fe79..d83edd145 100644
--- a/app/assets/javascripts/components/actions/statuses.jsx
+++ b/app/assets/javascripts/components/actions/statuses.jsx
@@ -28,7 +28,6 @@ export function fetchStatus(id) {
     const skipLoading = getState().getIn(['statuses', id], null) !== null;
 
     dispatch(fetchContext(id));
-    dispatch(fetchStatusCard(id));
 
     if (skipLoading) {
       return;
@@ -102,7 +101,10 @@ export function fetchContext(id) {
 
     api(getState).get(`/api/v1/statuses/${id}/context`).then(response => {
       dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants));
+      dispatch(fetchStatusCard(id));
     }).catch(error => {
+      dispatch(deleteStatusSuccess(id));
+      dispatch(deleteFromTimelines(id));
       dispatch(fetchContextFail(id, error));
     });
   };
diff --git a/app/assets/javascripts/components/features/status/index.jsx b/app/assets/javascripts/components/features/status/index.jsx
index e17c078d2..7c9fcef3d 100644
--- a/app/assets/javascripts/components/features/status/index.jsx
+++ b/app/assets/javascripts/components/features/status/index.jsx
@@ -117,7 +117,7 @@ const Status = React.createClass({
     if (status === null) {
       return (
         <Column>
-          <LoadingIndicator />
+          <ColumnBackButton />
         </Column>
       );
     }