diff options
Diffstat (limited to 'app/assets/javascripts/components/features')
3 files changed, 44 insertions, 19 deletions
diff --git a/app/assets/javascripts/components/features/account/components/action_bar.jsx b/app/assets/javascripts/components/features/account/components/action_bar.jsx index aa37d9238..309471dd2 100644 --- a/app/assets/javascripts/components/features/account/components/action_bar.jsx +++ b/app/assets/javascripts/components/features/account/components/action_bar.jsx @@ -7,25 +7,24 @@ const ActionBar = React.createClass({ propTypes: { account: ImmutablePropTypes.map.isRequired, me: React.PropTypes.number.isRequired, - onFollow: React.PropTypes.func.isRequired, - onUnfollow: React.PropTypes.func.isRequired + onFollow: React.PropTypes.func.isRequired }, mixins: [PureRenderMixin], render () { const { account, me } = this.props; - + let infoText = ''; - let actionButton = ''; + let buttonText = ''; if (account.get('id') === me) { - infoText = 'This is you!'; + buttonText = 'This is you!'; } else { if (account.getIn(['relationship', 'following'])) { - actionButton = <Button text='Unfollow' onClick={this.props.onUnfollow} /> + buttonText = 'Unfollow'; } else { - actionButton = <Button text='Follow' onClick={this.props.onFollow} /> + buttonText = 'Follow'; } if (account.getIn(['relationship', 'followed_by'])) { @@ -35,7 +34,7 @@ const ActionBar = React.createClass({ return ( <div style={{ borderTop: '1px solid #363c4b', borderBottom: '1px solid #363c4b', padding: '10px', lineHeight: '36px', overflow: 'hidden', flex: '0 0 auto' }}> - {actionButton} <span style={{ color: '#616b86', fontWeight: '500', textTransform: 'uppercase', float: 'right', display: 'block' }}>{infoText}</span> + <Button text={buttonText} onClick={this.props.onFollow} disabled={account.get('id') === me} /> <span style={{ color: '#616b86', fontWeight: '500', textTransform: 'uppercase', float: 'right', display: 'block' }}>{infoText}</span> </div> ); }, diff --git a/app/assets/javascripts/components/features/account/index.jsx b/app/assets/javascripts/components/features/account/index.jsx index db0925d78..40c06c545 100644 --- a/app/assets/javascripts/components/features/account/index.jsx +++ b/app/assets/javascripts/components/features/account/index.jsx @@ -10,7 +10,12 @@ import { } from '../../actions/accounts'; import { deleteStatus } from '../../actions/statuses'; import { replyCompose } from '../../actions/compose'; -import { favourite, reblog } from '../../actions/interactions'; +import { + favourite, + reblog, + unreblog, + unfavourite +} from '../../actions/interactions'; import Header from './components/header'; import { selectStatus, @@ -54,11 +59,11 @@ const Account = React.createClass({ }, handleFollow () { - this.props.dispatch(followAccount(this.props.account.get('id'))); - }, - - handleUnfollow () { - this.props.dispatch(unfollowAccount(this.props.account.get('id'))); + if (this.props.account.getIn(['relationship', 'following'])) { + this.props.dispatch(unfollowAccount(this.props.account.get('id'))); + } else { + this.props.dispatch(followAccount(this.props.account.get('id'))); + } }, handleReply (status) { @@ -66,11 +71,19 @@ const Account = React.createClass({ }, handleReblog (status) { - this.props.dispatch(reblog(status)); + if (status.get('reblogged')) { + this.props.dispatch(unreblog(status)); + } else { + this.props.dispatch(reblog(status)); + } }, handleFavourite (status) { - this.props.dispatch(favourite(status)); + if (status.get('favourited')) { + this.props.dispatch(unfavourite(status)); + } else { + this.props.dispatch(favourite(status)); + } }, handleDelete (status) { diff --git a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx index 7a8407b09..605216eba 100644 --- a/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx +++ b/app/assets/javascripts/components/features/ui/containers/status_list_container.jsx @@ -1,7 +1,12 @@ import { connect } from 'react-redux'; import StatusList from '../../../components/status_list'; import { replyCompose } from '../../../actions/compose'; -import { reblog, favourite } from '../../../actions/interactions'; +import { + reblog, + favourite, + unreblog, + unfavourite +} from '../../../actions/interactions'; import { expandTimeline } from '../../../actions/timelines'; import { selectStatus } from '../../../reducers/timelines'; import { deleteStatus } from '../../../actions/statuses'; @@ -20,11 +25,19 @@ const mapDispatchToProps = function (dispatch, props) { }, onFavourite (status) { - dispatch(favourite(status)); + if (status.get('favourited')) { + dispatch(unfavourite(status)); + } else { + dispatch(favourite(status)); + } }, onReblog (status) { - dispatch(reblog(status)); + if (status.get('reblogged')) { + dispatch(unreblog(status)); + } else { + dispatch(reblog(status)); + } }, onScrollToBottom () { |