Make Presets stateless

This commit is contained in:
Erik Johnston 2015-07-16 17:24:33 +01:00
parent aa1b763518
commit 68d60aadd1
4 changed files with 6 additions and 28 deletions

View file

@ -27,7 +27,6 @@ var Presets = {
module.exports = {
propTypes: {
onChange: React.PropTypes.func,
default_preset: React.PropTypes.string,
preset: React.PropTypes.string
},
@ -36,25 +35,6 @@ module.exports = {
getDefaultProps: function() {
return {
onChange: function() {},
default_preset: Presets.PrivateChat,
};
},
getInitialState: function() {
return {
preset: this.props.preset || this.props.default_preset,
}
},
componentWillReceiveProps: function(new_props) {
if (new_props.preset) {
this.setState({
preset: new_props.preset
});
}
},
getPreset: function() {
return this.state.preset;
},
};

View file

@ -62,10 +62,9 @@ module.exports = {
options.topic = this.state.topic;
}
var preset = this.getPreset();
if (preset) {
if (preset != PresetValues.Custom) {
options.preset = preset;
if (this.state.preset) {
if (this.state.preset != PresetValues.Custom) {
options.preset = this.state.preset;
} else {
options.initial_state = [
{