diff options
author | nickago <ngonella@calpoly.edu> | 2015-08-20 15:06:03 -0700 |
---|---|---|
committer | nickago <ngonella@calpoly.edu> | 2015-08-20 15:06:03 -0700 |
commit | b000fc7c80f6baf4b30fc307b91e521f2a58bc2c (patch) | |
tree | 3b7910f15c5f33ec5f35dca1ddb27a0300e76ff2 /web | |
parent | 7d5d6ae5b09621f12947de7c28945a844db1ff85 (diff) | |
download | chat-b000fc7c80f6baf4b30fc307b91e521f2a58bc2c.tar.gz chat-b000fc7c80f6baf4b30fc307b91e521f2a58bc2c.tar.bz2 chat-b000fc7c80f6baf4b30fc307b91e521f2a58bc2c.zip |
Removed state holding functionality when switching to access history or session view
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/user_settings_security.jsx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/web/react/components/user_settings_security.jsx b/web/react/components/user_settings_security.jsx index 568d3fe99..39d707d90 100644 --- a/web/react/components/user_settings_security.jsx +++ b/web/react/components/user_settings_security.jsx @@ -62,11 +62,9 @@ module.exports = React.createClass({ this.setState({confirmPassword: e.target.value}); }, handleHistoryOpen: function() { - this.setState({willReturn: true}); $("#user_settings").modal('hide'); }, handleDevicesOpen: function() { - this.setState({willReturn: true}); $("#user_settings").modal('hide'); }, handleClose: function() { @@ -75,11 +73,7 @@ module.exports = React.createClass({ }); this.setState({currentPassword: '', newPassword: '', confirmPassword: '', serverError: null, passwordError: null}); - if (!this.state.willReturn) { - this.props.updateTab('general'); - } else { - this.setState({willReturn: false}); - } + this.props.updateTab('general'); }, componentDidMount: function() { $('#user_settings').on('hidden.bs.modal', this.handleClose); @@ -89,7 +83,7 @@ module.exports = React.createClass({ this.props.updateSection(''); }, getInitialState: function() { - return {currentPassword: '', newPassword: '', confirmPassword: '', willReturn: false}; + return {currentPassword: '', newPassword: '', confirmPassword: ''}; }, render: function() { var serverError = this.state.serverError ? this.state.serverError : null; |