1 files changed, 47 insertions, 3 deletions

diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 298f5ee70..2ac9a2371 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -11,6 +11,7 @@ var client = require('../utils/client.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
 var utils = require('../utils/utils.jsx');
 var Constants = require('../utils/constants.jsx');
+var assign = require('object-assign');
 
 function getNotificationsStateFromStores() {
     var user = UserStore.getCurrentUser();
@@ -95,11 +96,20 @@ var NotificationsTab = React.createClass({
             }.bind(this)
         );
     },
+    handleClose: function() {
+        $(this.getDOMNode()).find(".form-control").each(function() {
+            this.value = "";
+        });
+
+        this.setState(assign({},getNotificationsStateFromStores(),{server_error: null}));
+    },
     componentDidMount: function() {
         UserStore.addChangeListener(this._onChange);
+        $('#user_settings1').on('hidden.bs.modal', this.handleClose);
     },
     componentWillUnmount: function() {
         UserStore.removeChangeListener(this._onChange);
+        $('#user_settings1').off('hidden.bs.modal', this.handleClose);
     },
     _onChange: function() {
         var newState = getNotificationsStateFromStores();
@@ -502,6 +512,18 @@ var SecurityTab = React.createClass({
     handleDevicesOpen: function() {
         $("#user_settings1").modal('hide');
     },
+    handleClose: function() {
+        $(this.getDOMNode()).find(".form-control").each(function() {
+            this.value = "";
+        });
+        this.setState({current_password: '', new_password: '', confirm_password: '', server_error: null, password_error: null});
+    },
+    componentDidMount: function() {
+        $('#user_settings1').on('hidden.bs.modal', this.handleClose);
+    },
+    componentWillUnmount: function() {
+        $('#user_settings1').off('hidden.bs.modal', this.handleClose);
+    },
     getInitialState: function() {
         return { current_password: '', new_password: '', confirm_password: '' };
     },
@@ -699,13 +721,15 @@ var GeneralTab = React.createClass({
 
         if(!this.submitActive) return;
 
-        if(this.state.picture.type !== "image/jpeg") {
-            this.setState({client_error: "Only JPG images may be used for profile pictures"});
+        var picture = this.state.picture;
+
+        if(picture.type !== "image/jpeg" && picture.type !== "image/png") {
+            this.setState({client_error: "Only JPG or PNG images may be used for profile pictures"});
             return;
         }
 
         formData = new FormData();
-        formData.append('image', this.state.picture, this.state.picture.name);
+        formData.append('image', picture, picture.name);
 
         client.uploadProfileImage(formData,
             function(data) {
@@ -751,6 +775,19 @@ var GeneralTab = React.createClass({
         this.submitActive = false
         this.props.updateSection(section);
     },
+    handleClose: function() {
+        $(this.getDOMNode()).find(".form-control").each(function() {
+            this.value = "";
+        });
+
+        this.setState(assign({}, this.getInitialState(), {client_error: null, server_error: null, email_error: null}));
+    },
+    componentDidMount: function() {
+        $('#user_settings1').on('hidden.bs.modal', this.handleClose);
+    },
+    componentWillUnmount: function() {
+        $('#user_settings1').off('hidden.bs.modal', this.handleClose);
+    },
     getInitialState: function() {
         var user = this.props.user;
 
@@ -994,10 +1031,14 @@ var AppearanceTab = React.createClass({
         var hex = utils.rgb2hex(e.target.style.backgroundColor);
         this.setState({ theme: hex.toLowerCase() });
     },
+    handleClose: function() {
+        this.setState({server_error: null});
+    },
     componentDidMount: function() {
         if (this.props.activeSection === "theme") {
             $(this.refs[this.state.theme].getDOMNode()).addClass('active-border');
         }
+        $('#user_settings1').on('hidden.bs.modal', this.handleClose);
     },
     componentDidUpdate: function() {
         if (this.props.activeSection === "theme") {
@@ -1005,6 +1046,9 @@ var AppearanceTab = React.createClass({
             $(this.refs[this.state.theme].getDOMNode()).addClass('active-border');
         }
     },
+    componentWillUnmount: function() {
+        $('#user_settings1').off('hidden.bs.modal', this.handleClose);
+    },
     getInitialState: function() {
         var user = UserStore.getCurrentUser();
         var theme = config.ThemeColors != null ? config.ThemeColors[0] : "#2389d7";