diff options
| author | Surinna Curtis <ekiru.0@gmail.com> | 2017-09-09 05:25:33 -0500 |
|---|---|---|
| committer | Surinna Curtis <ekiru.0@gmail.com> | 2017-09-13 21:47:30 -0500 |
| commit | 323d437a09c91f61e82e097a74f3b431509187d0 (patch) | |
| tree | ad9ed479103b3fde2e52189abc89846897246890 | |
| parent | 3278c08c290535e14c9c09559199ed24dd0409c6 (diff) | |
satisfy eslint
| -rw-r--r-- | app/javascript/mastodon/components/account.js | 6 | ||||
| -rw-r--r-- | app/javascript/mastodon/containers/account_container.js | 3 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/ui/components/mute_modal.js | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js index 5a0c1c1c8..1b8b107e9 100644 --- a/app/javascript/mastodon/components/account.js +++ b/app/javascript/mastodon/components/account.js @@ -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> diff --git a/app/javascript/mastodon/containers/account_container.js b/app/javascript/mastodon/containers/account_container.js index 79e9e6e98..b4b8f4be2 100644 --- a/app/javascript/mastodon/containers/account_container.js +++ b/app/javascript/mastodon/containers/account_container.js @@ -63,9 +63,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ } }, + onMuteNotifications (account, notifications) { dispatch(muteAccount(account.get('id'), notifications)); - } + }, }); export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Account)); diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.js b/app/javascript/mastodon/features/ui/components/mute_modal.js index ef7c13f0a..b5e83bb71 100644 --- a/app/javascript/mastodon/features/ui/components/mute_modal.js +++ b/app/javascript/mastodon/features/ui/components/mute_modal.js @@ -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> |