gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Merge branch 'fix_626' of https://github.com/rmhasan/mastodon into rmhasan-fix_626

Browse source
This commit is contained in:
Eugen Rochko 2017-02-26 22:44:31 +01:00
commit 4bb8ff7c8e
3 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/components/actions/statuses.jsx
View file

@ -28,7 +28,6 @@ export function fetchStatus(id) {
const skipLoading = getState().getIn(['statuses', id], null) !== null; const skipLoading = getState().getIn(['statuses', id], null) !== null;
dispatch(fetchContext(id)); dispatch(fetchContext(id));
dispatch(fetchStatusCard(id));
if (skipLoading) { if (skipLoading) {
return; return;
@ -102,8 +101,14 @@ export function fetchContext(id) {
api(getState).get(`/api/v1/statuses/${id}/context`).then(response => { api(getState).get(`/api/v1/statuses/${id}/context`).then(response => {
dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants)); dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants));
dispatch(fetchStatusCard(id));
}).catch(error => { }).catch(error => {
dispatch(fetchContextFail(id, error)); if (error.response.status == 404){
dispatch(deleteStatusSuccess(id));
dispatch(deleteFromTimelines(id));
}else{
dispatch(fetchContextFail(id, error));
}
}); });
}; };
}; };

16
app/assets/javascripts/components/components/status_not_found.jsx Normal file
View file

@ -0,0 +1,16 @@
import { FormattedMessage } from 'react-intl';
const style = {
textAlign: 'center',
fontSize: '16px',
fontWeight: '500',
paddingTop: '120px'
};
const StatusNotFound = () => (
<div className='status-not-found-indicator' style={style}>
<FormattedMessage id='status_not_found_indicator.label' defaultMessage='Status Not Found' />
</div>
);
export default StatusNotFound;

5
app/assets/javascripts/components/features/status/index.jsx
View file

@ -4,7 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { fetchStatus } from '../../actions/statuses'; import { fetchStatus } from '../../actions/statuses';
import Immutable from 'immutable'; import Immutable from 'immutable';
import EmbeddedStatus from '../../components/status'; import EmbeddedStatus from '../../components/status';
import LoadingIndicator from '../../components/loading_indicator'; import StatusNotFound from '../../components/status_not_found';
import DetailedStatus from './components/detailed_status'; import DetailedStatus from './components/detailed_status';
import ActionBar from './components/action_bar'; import ActionBar from './components/action_bar';
import Column from '../ui/components/column'; import Column from '../ui/components/column';
@ -117,7 +117,8 @@ const Status = React.createClass({
if (status === null) { if (status === null) {
return ( return (
<Column> <Column>
<LoadingIndicator /> <ColumnBackButton />
<StatusNotFound />
</Column> </Column>
); );
} }