Merge pull request #570 from rgarmsen2295/fix-initial-state-calls

Refactor remaining uses of getInitialState and componentWillMount

1 files changed, 7 insertions, 3 deletions

diff --git a/web/react/components/user_settings_security.jsx b/web/react/components/user_settings_security.jsx
index d83151cd8..6ccd09cb1 100644
--- a/web/react/components/user_settings_security.jsx
+++ b/web/react/components/user_settings_security.jsx
@@ -16,8 +16,9 @@ export default class SecurityTab extends React.Component {
         this.updateNewPassword = this.updateNewPassword.bind(this);
         this.updateConfirmPassword = this.updateConfirmPassword.bind(this);
         this.handleClose = this.handleClose.bind(this);
+        this.setupInitialState = this.setupInitialState.bind(this);
 
-        this.state = {currentPassword: '', newPassword: '', confirmPassword: ''};
+        this.state = this.setupInitialState();
     }
     submitPassword(e) {
         e.preventDefault();
@@ -51,10 +52,10 @@ export default class SecurityTab extends React.Component {
             function success() {
                 this.props.updateSection('');
                 AsyncClient.getMe();
-                this.setState({currentPassword: '', newPassword: '', confirmPassword: ''});
+                this.setState(this.setupInitialState());
             }.bind(this),
             function fail(err) {
-                var state = this.getInitialState();
+                var state = this.setupInitialState();
                 if (err.message) {
                     state.serverError = err.message;
                 } else {
@@ -88,6 +89,9 @@ export default class SecurityTab extends React.Component {
 
         this.props.updateTab('general');
     }
+    setupInitialState() {
+        return {currentPassword: '', newPassword: '', confirmPassword: ''};
+    }
     componentDidMount() {
         $('#user_settings').on('hidden.bs.modal', this.handleClose);
     }