From 9bde804ba2fe9ea934e702367b13461fb8da431f Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 30 Jan 2017 15:22:04 +0100 Subject: [PATCH] Resolve confusion between ColumnBackButton and the slim version that the public timeline has been using --- .../column_back_button_slim.jsx} | 4 ++-- .../features/favourited_statuses/index.jsx | 4 ++-- .../components/features/follow_requests/index.jsx | 4 ++-- .../components/features/hashtag_timeline/index.jsx | 12 ++++++------ .../components/features/public_timeline/index.jsx | 12 ++++++------ 5 files changed, 18 insertions(+), 18 deletions(-) rename app/assets/javascripts/components/{features/public_timeline/components/column_back_button.jsx => components/column_back_button_slim.jsx} (91%) diff --git a/app/assets/javascripts/components/features/public_timeline/components/column_back_button.jsx b/app/assets/javascripts/components/components/column_back_button_slim.jsx similarity index 91% rename from app/assets/javascripts/components/features/public_timeline/components/column_back_button.jsx rename to app/assets/javascripts/components/components/column_back_button_slim.jsx index 4535f8f2..cdbe1350 100644 --- a/app/assets/javascripts/components/features/public_timeline/components/column_back_button.jsx +++ b/app/assets/javascripts/components/components/column_back_button_slim.jsx @@ -18,7 +18,7 @@ const iconStyle = { marginRight: '5px' }; -const ColumnBackButton = React.createClass({ +const ColumnBackButtonSlim = React.createClass({ contextTypes: { router: React.PropTypes.object @@ -43,4 +43,4 @@ const ColumnBackButton = React.createClass({ }); -export default ColumnBackButton; +export default ColumnBackButtonSlim; diff --git a/app/assets/javascripts/components/features/favourited_statuses/index.jsx b/app/assets/javascripts/components/features/favourited_statuses/index.jsx index a2d52173..1e9dafbd 100644 --- a/app/assets/javascripts/components/features/favourited_statuses/index.jsx +++ b/app/assets/javascripts/components/features/favourited_statuses/index.jsx @@ -5,7 +5,7 @@ import LoadingIndicator from '../../components/loading_indicator'; import { fetchFavouritedStatuses, expandFavouritedStatuses } from '../../actions/favourites'; import Column from '../ui/components/column'; import StatusList from '../../components/status_list'; -import ColumnBackButton from '../public_timeline/components/column_back_button'; +import ColumnBackButtonSlim from '../../components/column_back_button_slim'; import { defineMessages, injectIntl } from 'react-intl'; const messages = defineMessages({ @@ -52,7 +52,7 @@ const Favourites = React.createClass({ return ( - + ); diff --git a/app/assets/javascripts/components/features/follow_requests/index.jsx b/app/assets/javascripts/components/features/follow_requests/index.jsx index 5c60b602..3bee532c 100644 --- a/app/assets/javascripts/components/features/follow_requests/index.jsx +++ b/app/assets/javascripts/components/features/follow_requests/index.jsx @@ -4,7 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import LoadingIndicator from '../../components/loading_indicator'; import { ScrollContainer } from 'react-router-scroll'; import Column from '../ui/components/column'; -import ColumnBackButton from '../../components/column_back_button'; +import ColumnBackButtonSlim from '../../components/column_back_button_slim'; import AccountAuthorizeContainer from './containers/account_authorize_container'; import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts'; import { defineMessages, injectIntl } from 'react-intl'; @@ -52,7 +52,7 @@ const FollowRequests = React.createClass({ return ( - +
{accountIds.map(id => diff --git a/app/assets/javascripts/components/features/hashtag_timeline/index.jsx b/app/assets/javascripts/components/features/hashtag_timeline/index.jsx index f28e01a0..011b1e54 100644 --- a/app/assets/javascripts/components/features/hashtag_timeline/index.jsx +++ b/app/assets/javascripts/components/features/hashtag_timeline/index.jsx @@ -7,7 +7,7 @@ import { updateTimeline, deleteFromTimelines } from '../../actions/timelines'; -import ColumnBackButton from '../public_timeline/components/column_back_button'; +import ColumnBackButtonSlim from '../../components/column_back_button_slim'; const HashtagTimeline = React.createClass({ @@ -27,10 +27,10 @@ const HashtagTimeline = React.createClass({ received (data) { switch(data.type) { - case 'update': - return dispatch(updateTimeline('tag', JSON.parse(data.message))); - case 'delete': - return dispatch(deleteFromTimelines(data.id)); + case 'update': + return dispatch(updateTimeline('tag', JSON.parse(data.message))); + case 'delete': + return dispatch(deleteFromTimelines(data.id)); } } @@ -69,7 +69,7 @@ const HashtagTimeline = React.createClass({ return ( - + ); diff --git a/app/assets/javascripts/components/features/public_timeline/index.jsx b/app/assets/javascripts/components/features/public_timeline/index.jsx index eac85f01..28cdc639 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 ( - + );