diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-30 15:22:31 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-30 15:22:31 +0100 |
commit | 57159804b843ccee40c23f987899a68f15446e17 (patch) | |
tree | 9a26320a80ef03ef4c40dfb024952511635b7351 /app/assets/javascripts/components/features/public_timeline/index.jsx | |
parent | b12bdd2aea2d4736b723aacb829b34e8576fb40c (diff) | |
parent | 9bde804ba2fe9ea934e702367b13461fb8da431f (diff) |
Merge branch 'PurpleBooth-add-missing-back-on-follow'
Diffstat (limited to 'app/assets/javascripts/components/features/public_timeline/index.jsx')
-rw-r--r-- | app/assets/javascripts/components/features/public_timeline/index.jsx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/components/features/public_timeline/index.jsx b/app/assets/javascripts/components/features/public_timeline/index.jsx index eac85f01b..28cdc639a 100644 --- a/app/assets/javascripts/components/features/public_timeline/index.jsx +++ b/app/assets/javascripts/components/features/public_timeline/index.jsx @@ -8,7 +8,7 @@ import { deleteFromTimelines } from '../../actions/timelines'; import { defineMessages, injectIntl } from 'react-intl'; -import ColumnBackButton from './components/column_back_button'; +import ColumnBackButtonSlim from '../../components/column_back_button_slim'; const messages = defineMessages({ title: { id: 'column.public', defaultMessage: 'Public' } @@ -33,10 +33,10 @@ const PublicTimeline = React.createClass({ received (data) { switch(data.type) { - case 'update': - return dispatch(updateTimeline('public', JSON.parse(data.message))); - case 'delete': - return dispatch(deleteFromTimelines(data.id)); + case 'update': + return dispatch(updateTimeline('public', JSON.parse(data.message))); + case 'delete': + return dispatch(deleteFromTimelines(data.id)); } } @@ -55,7 +55,7 @@ const PublicTimeline = React.createClass({ return ( <Column icon='globe' heading={intl.formatMessage(messages.title)}> - <ColumnBackButton /> + <ColumnBackButtonSlim /> <StatusListContainer type='public' /> </Column> ); |