diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-08-21 18:17:24 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-08-21 18:17:24 +0500 |
commit | 299bf056a584dd71cf0285b6ef1bbd596c07c0fe (patch) | |
tree | c1f32092efa1294c0a75d1e2f23154605ec8d001 /web/react/components/user_settings_security.jsx | |
parent | afb09a1b9dd83e480a8c4f5744bd79cafb88a682 (diff) | |
parent | 4a022752faf9a2b6c4de5cfa65f23adb578a96a5 (diff) | |
download | chat-299bf056a584dd71cf0285b6ef1bbd596c07c0fe.tar.gz chat-299bf056a584dd71cf0285b6ef1bbd596c07c0fe.tar.bz2 chat-299bf056a584dd71cf0285b6ef1bbd596c07c0fe.zip |
Merge branch 'master' of https://github.com/mattermost/platform into mm-1696
Conflicts:
web/react/components/setting_upload.jsx
web/react/components/team_import_tab.jsx
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; |