IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-3444 Preview features checkboxes don't reset after hitting cancel (#3462)

Browse Source
This commit is contained in:
enahum
2016-07-04 06:59:07 -04:00
committed by Joram Wilander
parent 24fe19965a
commit 0cdc242cfd
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webapp/components/user_settings/user_settings_advanced.jsx
View File

@@ -20,6 +20,7 @@ export default class AdvancedSettingsDisplay extends React.Component {
constructor(props) {
super(props);
this.getStateFromStores = this.getStateFromStores.bind(this);
this.updateSection = this.updateSection.bind(this);
this.updateSetting = this.updateSetting.bind(this);
this.toggleFeature = this.toggleFeature.bind(this);
@@ -27,6 +28,10 @@ export default class AdvancedSettingsDisplay extends React.Component {
this.renderFormattingSection = this.renderFormattingSection.bind(this);
this.state = this.getStateFromStores();
}
getStateFromStores() {
const preReleaseFeaturesKeys = Object.keys(PreReleaseFeatures);
const advancedSettings = PreferenceStore.getCategory(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS);
const settings = {
@@ -57,7 +62,11 @@ export default class AdvancedSettingsDisplay extends React.Component {
}
}
this.state = {preReleaseFeatures: PreReleaseFeatures, settings, preReleaseFeaturesKeys, enabledFeatures};
return {preReleaseFeatures: PreReleaseFeatures,
settings,
preReleaseFeaturesKeys,
enabledFeatures
};
}
updateSetting(setting, value) {
@@ -118,6 +127,9 @@ export default class AdvancedSettingsDisplay extends React.Component {
updateSection(section) {
$('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
if (!section) {
this.setState(this.getStateFromStores());
}
this.props.updateSection(section);
}