diff options
author | =Corey Hulen <corey@hulen.com> | 2015-08-21 08:54:48 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-08-21 08:54:48 -0700 |
commit | 0ae7180ac5e0cea1e240a1d29c5822159762b2e3 (patch) | |
tree | 6fb954e8d5609286b861c3e378543f28180d84d5 /web/react/components/user_settings_security.jsx | |
parent | 60be2a5636e52bd3193978691f9b53d896e4c45c (diff) | |
parent | ddcdcc3e2c85efbfd1d91d69c0f5c0af7c7cb1c7 (diff) | |
download | chat-0ae7180ac5e0cea1e240a1d29c5822159762b2e3.tar.gz chat-0ae7180ac5e0cea1e240a1d29c5822159762b2e3.tar.bz2 chat-0ae7180ac5e0cea1e240a1d29c5822159762b2e3.zip |
Merging
Diffstat (limited to 'web/react/components/user_settings_security.jsx')
-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; |