diff options
Diffstat (limited to 'webapp/components/user_settings/user_settings_general.jsx')
| -rw-r--r-- | webapp/components/user_settings/user_settings_general.jsx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx index be1d1e6c5..6149b1630 100644 --- a/webapp/components/user_settings/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general.jsx @@ -160,6 +160,11 @@ class UserSettingsGeneralTab extends React.Component { const email = this.state.email.trim().toLowerCase(); const confirmEmail = this.state.confirmEmail.trim().toLowerCase(); + if (user.email === email) { + this.updateSection(''); + return; + } + const {formatMessage} = this.props.intl; if (email === '' || !Utils.isEmail(email)) { this.setState({emailError: formatMessage(holders.validEmail), clientError: '', serverError: ''}); @@ -171,11 +176,6 @@ class UserSettingsGeneralTab extends React.Component { return; } - if (user.email === email) { - this.updateSection(''); - return; - } - user.email = email; this.submitUser(user, true); } @@ -342,7 +342,7 @@ class UserSettingsGeneralTab extends React.Component { <div className='col-sm-7'> <input className='form-control' - type='text' + type='email' onChange={this.updateEmail} value={this.state.email} /> @@ -363,7 +363,7 @@ class UserSettingsGeneralTab extends React.Component { <div className='col-sm-7'> <input className='form-control' - type='text' + type='email' onChange={this.updateConfirmEmail} value={this.state.confirmEmail} /> @@ -681,6 +681,7 @@ class UserSettingsGeneralTab extends React.Component { type='text' onChange={this.updateNickname} value={this.state.nickname} + autoCapitalize='off' /> </div> </div> @@ -764,6 +765,7 @@ class UserSettingsGeneralTab extends React.Component { type='text' onChange={this.updateUsername} value={this.state.username} + autoCapitalize='off' /> </div> </div> |