mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-08-25 01:44:52 +00:00
satisfy eslint
This commit is contained in:
parent
3278c08c29
commit
323d437a09
|
@ -48,7 +48,7 @@ export default class Account extends ImmutablePureComponent {
|
|||
}
|
||||
|
||||
handleUnmuteNotifications = () => {
|
||||
this.props.onMuteNotifications(this.props.account, false);
|
||||
this.props.onMuteNotifications(this.props.account, false);
|
||||
}
|
||||
|
||||
render () {
|
||||
|
@ -84,11 +84,7 @@ export default class Account extends ImmutablePureComponent {
|
|||
if (muting.get('notifications')) {
|
||||
hidingNotificationsButton = <IconButton active icon='bell' title={intl.formatMessage(messages.unmute_notifications, { name: account.get('username') })} onClick={this.handleUnmuteNotifications} />;
|
||||
} else {
|
||||
<<<<<<< HEAD
|
||||
hidingNotificationsButton = <IconButton active icon='bell' title={intl.formatMessage(messages.mute_notifications, { name: account.get('username') })} onClick={this.handleMuteNotifications} />
|
||||
=======
|
||||
hidingNotificationsButton = <IconButton active icon='bell-slash' title={intl.formatMessage(messages.mute_notifications, { name: account.get('username') })} onClick={this.handleMuteNotifications} />;
|
||||
>>>>>>> 917b2d5f... fixup swapped icons
|
||||
}
|
||||
buttons = (
|
||||
<div>
|
||||
|
|
|
@ -63,9 +63,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
|
|||
}
|
||||
},
|
||||
|
||||
|
||||
onMuteNotifications (account, notifications) {
|
||||
dispatch(muteAccount(account.get('id'), notifications));
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Account));
|
||||
|
|
|
@ -81,9 +81,9 @@ export default class MuteModal extends React.PureComponent {
|
|||
/>
|
||||
</p>
|
||||
<p>
|
||||
<label>
|
||||
<label htmlFor='mute-modal__hide-notifications-checkbox'>
|
||||
<FormattedMessage id='mute_modal.hide_notifications' defaultMessage='Hide notifications from this user?' />
|
||||
<input type='checkbox' checked={notifications} onChange={this.toggleNotifications} />
|
||||
<input id='mute-modal__hide-notifications-checkbox' type='checkbox' checked={notifications} onChange={this.toggleNotifications} />
|
||||
</label>
|
||||
</p>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue