You've already forked matrix-react-sdk
mirror of
https://github.com/matrix-org/matrix-react-sdk.git
synced 2025-11-20 16:22:28 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -729,6 +729,7 @@ module.exports = React.createClass({
|
|||||||
// to rebind the onChange each time we render
|
// to rebind the onChange each time we render
|
||||||
const onChange = (e) => {
|
const onChange = (e) => {
|
||||||
if (e.target.checked) {
|
if (e.target.checked) {
|
||||||
|
this._syncedSettings[setting.id] = setting.value;
|
||||||
UserSettingsStore.setSyncedSetting(setting.id, setting.value);
|
UserSettingsStore.setSyncedSetting(setting.id, setting.value);
|
||||||
}
|
}
|
||||||
dis.dispatch({
|
dis.dispatch({
|
||||||
@@ -741,7 +742,7 @@ module.exports = React.createClass({
|
|||||||
type="radio"
|
type="radio"
|
||||||
name={ setting.id }
|
name={ setting.id }
|
||||||
value={ setting.value }
|
value={ setting.value }
|
||||||
defaultChecked={ this._syncedSettings[setting.id] === setting.value }
|
checked={ this._syncedSettings[setting.id] === setting.value }
|
||||||
onChange={ onChange }
|
onChange={ onChange }
|
||||||
/>
|
/>
|
||||||
<label htmlFor={ setting.id + "_" + setting.value }>
|
<label htmlFor={ setting.id + "_" + setting.value }>
|
||||||
|
|||||||
Reference in New Issue
Block a user