commit: 57159804b843ccee40c23f987899a68f15446e17
parent: b12bdd2aea2d4736b723aacb829b34e8576fb40c
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 30 Jan 2017 15:22:31 +0100
Merge branch 'PurpleBooth-add-missing-back-on-follow'
Diffstat:
6 files changed, 62 insertions(+), 60 deletions(-)
diff --git a/app/assets/javascripts/components/components/column_back_button_slim.jsx b/app/assets/javascripts/components/components/column_back_button_slim.jsx
@@ -0,0 +1,46 @@
+import PureRenderMixin from 'react-addons-pure-render-mixin';
+import { FormattedMessage } from 'react-intl';
+
+const outerStyle = {
+ position: 'absolute',
+ right: '0',
+ top: '-48px',
+ padding: '15px',
+ fontSize: '16px',
+ background: '#2f3441',
+ flex: '0 0 auto',
+ cursor: 'pointer',
+ color: '#2b90d9'
+};
+
+const iconStyle = {
+ display: 'inline-block',
+ marginRight: '5px'
+};
+
+const ColumnBackButtonSlim = React.createClass({
+
+ contextTypes: {
+ router: React.PropTypes.object
+ },
+
+ mixins: [PureRenderMixin],
+
+ handleClick () {
+ this.context.router.push('/');
+ },
+
+ render () {
+ return (
+ <div style={{ position: 'relative' }}>
+ <div style={outerStyle} onClick={this.handleClick} className='column-back-button'>
+ <i className='fa fa-fw fa-chevron-left' style={iconStyle} />
+ <FormattedMessage id='column_back_button.label' defaultMessage='Back' />
+ </div>
+ </div>
+ );
+ }
+
+});
+
+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
@@ -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 (
<Column icon='star' heading={intl.formatMessage(messages.heading)}>
- <ColumnBackButton />
+ <ColumnBackButtonSlim />
<StatusList statusIds={statusIds} me={me} onScrollToBottom={this.handleScrollToBottom} />
</Column>
);
diff --git a/app/assets/javascripts/components/features/follow_requests/index.jsx b/app/assets/javascripts/components/features/follow_requests/index.jsx
@@ -4,6 +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 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';
@@ -51,6 +52,7 @@ const FollowRequests = React.createClass({
return (
<Column icon='users' heading={intl.formatMessage(messages.heading)}>
+ <ColumnBackButtonSlim />
<ScrollContainer scrollKey='follow_requests'>
<div className='scrollable' onScroll={this.handleScroll}>
{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
@@ -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 (
<Column icon='hashtag' heading={id}>
- <ColumnBackButton />
+ <ColumnBackButtonSlim />
<StatusListContainer type='tag' id={id} />
</Column>
);
diff --git a/app/assets/javascripts/components/features/public_timeline/components/column_back_button.jsx b/app/assets/javascripts/components/features/public_timeline/components/column_back_button.jsx
@@ -1,46 +0,0 @@
-import PureRenderMixin from 'react-addons-pure-render-mixin';
-import { FormattedMessage } from 'react-intl';
-
-const outerStyle = {
- position: 'absolute',
- right: '0',
- top: '-48px',
- padding: '15px',
- fontSize: '16px',
- background: '#2f3441',
- flex: '0 0 auto',
- cursor: 'pointer',
- color: '#2b90d9'
-};
-
-const iconStyle = {
- display: 'inline-block',
- marginRight: '5px'
-};
-
-const ColumnBackButton = React.createClass({
-
- contextTypes: {
- router: React.PropTypes.object
- },
-
- mixins: [PureRenderMixin],
-
- handleClick () {
- this.context.router.push('/');
- },
-
- render () {
- return (
- <div style={{ position: 'relative' }}>
- <div style={outerStyle} onClick={this.handleClick} className='column-back-button'>
- <i className='fa fa-fw fa-chevron-left' style={iconStyle} />
- <FormattedMessage id='column_back_button.label' defaultMessage='Back' />
- </div>
- </div>
- );
- }
-
-});
-
-export default ColumnBackButton;
diff --git 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>
);
