hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satisfy eslint

signup-info-prompt
Surinna Curtis 2017-09-09 05:25:33 -05:00
parent 3278c08c29
commit 323d437a09
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/components/account.js
View File

@ -84,11 +84,7 @@ export default class Account extends ImmutablePureComponent {
if (muting.get('notifications')) { if (muting.get('notifications')) {
hidingNotificationsButton = <IconButton active icon='bell' title={intl.formatMessage(messages.unmute_notifications, { name: account.get('username') })} onClick={this.handleUnmuteNotifications} />; hidingNotificationsButton = <IconButton active icon='bell' title={intl.formatMessage(messages.unmute_notifications, { name: account.get('username') })} onClick={this.handleUnmuteNotifications} />;
} else { } 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} />; hidingNotificationsButton = <IconButton active icon='bell-slash' title={intl.formatMessage(messages.mute_notifications, { name: account.get('username') })} onClick={this.handleMuteNotifications} />;
>>>>>>> 917b2d5f... fixup swapped icons
} }
buttons = ( buttons = (
<div> <div>

3
app/javascript/mastodon/containers/account_container.js
View File

@ -63,9 +63,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
} }
}, },
onMuteNotifications (account, notifications) { onMuteNotifications (account, notifications) {
dispatch(muteAccount(account.get('id'), notifications)); dispatch(muteAccount(account.get('id'), notifications));
} },
}); });
export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Account)); export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Account));

4
app/javascript/mastodon/features/ui/components/mute_modal.js
View File

@ -81,9 +81,9 @@ export default class MuteModal extends React.PureComponent {
/> />
</p> </p>
<p> <p>
<label> <label htmlFor='mute-modal__hide-notifications-checkbox'>
<FormattedMessage id='mute_modal.hide_notifications' defaultMessage='Hide notifications from this user?' /> <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> </label>
</p> </p>
</div> </div>