diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-30 15:22:04 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-30 15:22:04 +0100 |
commit | 9bde804ba2fe9ea934e702367b13461fb8da431f (patch) | |
tree | 9a26320a80ef03ef4c40dfb024952511635b7351 /app/assets/javascripts/components/features/public_timeline | |
parent | b1571b1e1d679c227aecfdb5d3b599d68f875b64 (diff) |
Resolve confusion between ColumnBackButton and the slim version that
the public timeline has been using
Diffstat (limited to 'app/assets/javascripts/components/features/public_timeline')
-rw-r--r-- | app/assets/javascripts/components/features/public_timeline/components/column_back_button.jsx | 46 | ||||
-rw-r--r-- | app/assets/javascripts/components/features/public_timeline/index.jsx | 12 |
2 files changed, 6 insertions, 52 deletions
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 deleted file mode 100644 index 4535f8f28..000000000 --- a/app/assets/javascripts/components/features/public_timeline/components/column_back_button.jsx +++ /dev/null @@ -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 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> ); |