No longer errors upon saving the same info in Account Settings -> General

Этот коммит содержится в:
Reed Garmsen
2015-12-11 16:03:48 -08:00
родитель ce03fbc6d8
Коммит d6ad130756

Просмотреть файл

@@ -51,7 +51,7 @@ export default class UserSettingsGeneralTab extends React.Component {
}
if (user.username === username) {
this.setState({clientError: 'You must submit a new username.', emailError: '', serverError: ''});
this.updateSection('');
return;
}
@@ -66,7 +66,7 @@ export default class UserSettingsGeneralTab extends React.Component {
const nickname = this.state.nickname.trim();
if (user.nickname === nickname) {
this.setState({clientError: 'You must submit a new nickname.', emailError: '', serverError: ''});
this.updateSection('');
return;
}
@@ -82,7 +82,7 @@ export default class UserSettingsGeneralTab extends React.Component {
const lastName = this.state.lastName.trim();
if (user.first_name === firstName && user.last_name === lastName) {
this.setState({clientError: 'You must submit a new first or last name.', emailError: '', serverError: ''});
this.updateSection('');
return;
}
@@ -98,10 +98,6 @@ export default class UserSettingsGeneralTab extends React.Component {
const email = this.state.email.trim().toLowerCase();
const confirmEmail = this.state.confirmEmail.trim().toLowerCase();
if (user.email === email) {
return;
}
if (email === '' || !Utils.isEmail(email)) {
this.setState({emailError: 'Please enter a valid email address.', clientError: '', serverError: ''});
return;
@@ -112,6 +108,11 @@ export default class UserSettingsGeneralTab extends React.Component {
return;
}
if (user.email === email) {
this.updateSection('');
return;
}
user.email = email;
this.submitUser(user, true);
}