nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'PurpleBooth-add-missing-back-on-follow'

This commit is contained in:
Eugen Rochko 2017-01-30 15:22:31 +01:00
parent b12bdd2aea 9bde804ba2
commit 57159804b8
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/components/features/public_timeline/components/column_back_button.jsx → app/assets/javascripts/components/components/column_back_button_slim.jsx
View File

@ -18,7 +18,7 @@ const iconStyle = {
marginRight: '5px' marginRight: '5px'
}; };
const ColumnBackButton = React.createClass({ const ColumnBackButtonSlim = React.createClass({
contextTypes: { contextTypes: {
router: React.PropTypes.object router: React.PropTypes.object
@ -43,4 +43,4 @@ const ColumnBackButton = React.createClass({
}); });
export default ColumnBackButton; export default ColumnBackButtonSlim;

4
app/assets/javascripts/components/features/favourited_statuses/index.jsx
View File

@ -5,7 +5,7 @@ import LoadingIndicator from '../../components/loading_indicator';
import { fetchFavouritedStatuses, expandFavouritedStatuses } from '../../actions/favourites'; import { fetchFavouritedStatuses, expandFavouritedStatuses } from '../../actions/favourites';
import Column from '../ui/components/column'; import Column from '../ui/components/column';
import StatusList from '../../components/status_list'; 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'; import { defineMessages, injectIntl } from 'react-intl';
const messages = defineMessages({ const messages = defineMessages({
@ -52,7 +52,7 @@ const Favourites = React.createClass({
return ( return (
<Column icon='star' heading={intl.formatMessage(messages.heading)}> <Column icon='star' heading={intl.formatMessage(messages.heading)}>
<ColumnBackButton /> <ColumnBackButtonSlim />
<StatusList statusIds={statusIds} me={me} onScrollToBottom={this.handleScrollToBottom} /> <StatusList statusIds={statusIds} me={me} onScrollToBottom={this.handleScrollToBottom} />
</Column> </Column>
); );

2
app/assets/javascripts/components/features/follow_requests/index.jsx
View File

@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import LoadingIndicator from '../../components/loading_indicator'; import LoadingIndicator from '../../components/loading_indicator';
import { ScrollContainer } from 'react-router-scroll'; import { ScrollContainer } from 'react-router-scroll';
import Column from '../ui/components/column'; import Column from '../ui/components/column';
import ColumnBackButtonSlim from '../../components/column_back_button_slim';
import AccountAuthorizeContainer from './containers/account_authorize_container'; import AccountAuthorizeContainer from './containers/account_authorize_container';
import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts'; import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
import { defineMessages, injectIntl } from 'react-intl'; import { defineMessages, injectIntl } from 'react-intl';
@ -51,6 +52,7 @@ const FollowRequests = React.createClass({
return ( return (
<Column icon='users' heading={intl.formatMessage(messages.heading)}> <Column icon='users' heading={intl.formatMessage(messages.heading)}>
<ColumnBackButtonSlim />
<ScrollContainer scrollKey='follow_requests'> <ScrollContainer scrollKey='follow_requests'>
<div className='scrollable' onScroll={this.handleScroll}> <div className='scrollable' onScroll={this.handleScroll}>
{accountIds.map(id => {accountIds.map(id =>

12
app/assets/javascripts/components/features/hashtag_timeline/index.jsx
View File

@ -7,7 +7,7 @@ import {
updateTimeline, updateTimeline,
deleteFromTimelines deleteFromTimelines
} from '../../actions/timelines'; } from '../../actions/timelines';
import ColumnBackButton from '../public_timeline/components/column_back_button'; import ColumnBackButtonSlim from '../../components/column_back_button_slim';
const HashtagTimeline = React.createClass({ const HashtagTimeline = React.createClass({
@ -27,10 +27,10 @@ const HashtagTimeline = React.createClass({
received (data) { received (data) {
switch(data.type) { switch(data.type) {
case 'update': case 'update':
return dispatch(updateTimeline('tag', JSON.parse(data.message))); return dispatch(updateTimeline('tag', JSON.parse(data.message)));
case 'delete': case 'delete':
return dispatch(deleteFromTimelines(data.id)); return dispatch(deleteFromTimelines(data.id));
} }
} }
@ -69,7 +69,7 @@ const HashtagTimeline = React.createClass({
return ( return (
<Column icon='hashtag' heading={id}> <Column icon='hashtag' heading={id}>
<ColumnBackButton /> <ColumnBackButtonSlim />
<StatusListContainer type='tag' id={id} /> <StatusListContainer type='tag' id={id} />
</Column> </Column>
); );

12
app/assets/javascripts/components/features/public_timeline/index.jsx
View File

@ -8,7 +8,7 @@ import {
deleteFromTimelines deleteFromTimelines
} from '../../actions/timelines'; } from '../../actions/timelines';
import { defineMessages, injectIntl } from 'react-intl'; import { defineMessages, injectIntl } from 'react-intl';
import ColumnBackButton from './components/column_back_button'; import ColumnBackButtonSlim from '../../components/column_back_button_slim';
const messages = defineMessages({ const messages = defineMessages({
title: { id: 'column.public', defaultMessage: 'Public' } title: { id: 'column.public', defaultMessage: 'Public' }
@ -33,10 +33,10 @@ const PublicTimeline = React.createClass({
received (data) { received (data) {
switch(data.type) { switch(data.type) {
case 'update': case 'update':
return dispatch(updateTimeline('public', JSON.parse(data.message))); return dispatch(updateTimeline('public', JSON.parse(data.message)));
case 'delete': case 'delete':
return dispatch(deleteFromTimelines(data.id)); return dispatch(deleteFromTimelines(data.id));
} }
} }
@ -55,7 +55,7 @@ const PublicTimeline = React.createClass({
return ( return (
<Column icon='globe' heading={intl.formatMessage(messages.title)}> <Column icon='globe' heading={intl.formatMessage(messages.title)}>
<ColumnBackButton /> <ColumnBackButtonSlim />
<StatusListContainer type='public' /> <StatusListContainer type='public' />
</Column> </Column>
); );