diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2017-12-26 17:03:29 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-26 17:03:29 -0500 |
commit | 7347bc733418651216f22f224caf656471499a08 (patch) | |
tree | ae9b93b06d6955258f5159dc4285e7ba2253b6f2 /app/javascript/flavours/glitch/components | |
parent | e6ab869d956eb088eff6ce8b8b6114fb0d6d63fd (diff) | |
parent | 20ad071931ef520cdae6bf683ee52d369de8314b (diff) |
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
Merge various small vanilla updates into glitch
Diffstat (limited to 'app/javascript/flavours/glitch/components')
-rw-r--r-- | app/javascript/flavours/glitch/components/account.js | 1 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/components/setting_text.js | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/javascript/flavours/glitch/components/account.js b/app/javascript/flavours/glitch/components/account.js index ac07051db..a1f075491 100644 --- a/app/javascript/flavours/glitch/components/account.js +++ b/app/javascript/flavours/glitch/components/account.js @@ -27,6 +27,7 @@ export default class Account extends ImmutablePureComponent { onFollow: PropTypes.func.isRequired, onBlock: PropTypes.func.isRequired, onMute: PropTypes.func.isRequired, + onMuteNotifications: PropTypes.func.isRequired, intl: PropTypes.object.isRequired, hidden: PropTypes.bool, }; diff --git a/app/javascript/flavours/glitch/components/setting_text.js b/app/javascript/flavours/glitch/components/setting_text.js index a6dde4c0f..2c1b70bc3 100644 --- a/app/javascript/flavours/glitch/components/setting_text.js +++ b/app/javascript/flavours/glitch/components/setting_text.js @@ -6,24 +6,24 @@ export default class SettingText extends React.PureComponent { static propTypes = { settings: ImmutablePropTypes.map.isRequired, - settingKey: PropTypes.array.isRequired, + settingPath: PropTypes.array.isRequired, label: PropTypes.string.isRequired, onChange: PropTypes.func.isRequired, }; handleChange = (e) => { - this.props.onChange(this.props.settingKey, e.target.value); + this.props.onChange(this.props.settingPath, e.target.value); } render () { - const { settings, settingKey, label } = this.props; + const { settings, settingPath, label } = this.props; return ( <label> <span style={{ display: 'none' }}>{label}</span> <input className='setting-text' - value={settings.getIn(settingKey)} + value={settings.getIn(settingPath)} onChange={this.handleChange} placeholder={label} /> |