diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-09 17:01:23 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-09 17:01:23 -0600 |
commit | 622c8fdb75f20f1aee73b5db6d2dc90416bb3b08 (patch) | |
tree | 940b08c3ccbc5901877d0afdb086f42055e5703e /app/javascript/flavours/glitch/features/notifications | |
parent | 991371af5f22ba85199f3f66bab5f70b404de95f (diff) | |
parent | aef4b1af666f3fe66778bff0bab83b780fc71732 (diff) |
Merge pull request #314 from chriswmartin/merge-vanilla-updates-2
Merge vanilla updates into glitch - round 2
Diffstat (limited to 'app/javascript/flavours/glitch/features/notifications')
-rw-r--r-- | app/javascript/flavours/glitch/features/notifications/components/column_settings.js | 4 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/javascript/flavours/glitch/features/notifications/components/column_settings.js b/app/javascript/flavours/glitch/features/notifications/components/column_settings.js index 23545185c..d9638aaf3 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/column_settings.js +++ b/app/javascript/flavours/glitch/features/notifications/components/column_settings.js @@ -14,8 +14,8 @@ export default class ColumnSettings extends React.PureComponent { onClear: PropTypes.func.isRequired, }; - onPushChange = (key, checked) => { - this.props.onChange(['push', ...key], checked); + onPushChange = (path, checked) => { + this.props.onChange(['push', ...path], checked); } render () { diff --git a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js index 95109fe4d..9585ea556 100644 --- a/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js +++ b/app/javascript/flavours/glitch/features/notifications/containers/column_settings_container.js @@ -18,11 +18,11 @@ const mapStateToProps = state => ({ const mapDispatchToProps = (dispatch, { intl }) => ({ - onChange (key, checked) { - if (key[0] === 'push') { - dispatch(changePushNotifications(key.slice(1), checked)); + onChange (path, checked) { + if (path[0] === 'push') { + dispatch(changePushNotifications(path.slice(1), checked)); } else { - dispatch(changeSetting(['notifications', ...key], checked)); + dispatch(changeSetting(['notifications', ...path], checked)); } }, |