Merge pull request #674 from Trozz/PLT-41

PLT-41 Automatically convert uppercase letters to lowercase in username input box.
Этот коммит содержится в:
Joram Wilander
2015-09-14 14:45:33 -04:00
родитель 125b7dc71b c961c529af
Коммит 312f7d7656
4 изменённых файлов: 5 добавлений и 7 удалений

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

@@ -32,7 +32,7 @@ export default class SignupUserComplete extends React.Component {
handleSubmit(e) { handleSubmit(e) {
e.preventDefault(); e.preventDefault();
this.state.user.username = React.findDOMNode(this.refs.name).value.trim(); this.state.user.username = React.findDOMNode(this.refs.name).value.trim().toLowerCase();
if (!this.state.user.username) { if (!this.state.user.username) {
this.setState({nameError: 'This field is required', emailError: '', passwordError: '', serverError: ''}); this.setState({nameError: 'This field is required', emailError: '', passwordError: '', serverError: ''});
return; return;

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

@@ -22,7 +22,7 @@ export default class TeamSignupUsernamePage extends React.Component {
submitNext(e) { submitNext(e) {
e.preventDefault(); e.preventDefault();
var name = React.findDOMNode(this.refs.name).value.trim(); var name = React.findDOMNode(this.refs.name).value.trim().toLowerCase();
var usernameError = Utils.isValidUsername(name); var usernameError = Utils.isValidUsername(name);
if (usernameError === 'Cannot use a reserved word as a username.') { if (usernameError === 'Cannot use a reserved word as a username.') {

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

@@ -40,7 +40,7 @@ export default class UserSettingsGeneralTab extends React.Component {
e.preventDefault(); e.preventDefault();
var user = this.props.user; var user = this.props.user;
var username = this.state.username.trim(); var username = this.state.username.trim().toLowerCase();
var usernameError = utils.isValidUsername(username); var usernameError = utils.isValidUsername(username);
if (usernameError === 'Cannot use a reserved word as a username.') { if (usernameError === 'Cannot use a reserved word as a username.') {

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

@@ -828,14 +828,12 @@ export function isValidUsername(name) {
} else if (name.length < 3 || name.length > 15) { } else if (name.length < 3 || name.length > 15) {
error = 'Must be between 3 and 15 characters'; error = 'Must be between 3 and 15 characters';
} else if (!(/^[a-z0-9\.\-\_]+$/).test(name)) { } else if (!(/^[a-z0-9\.\-\_]+$/).test(name)) {
error = "Must contain only lowercase letters, numbers, and the symbols '.', '-', and '_'."; error = "Must contain only letters, numbers, and the symbols '.', '-', and '_'.";
} else if (!(/[a-z]/).test(name.charAt(0))) { } else if (!(/[a-z]/).test(name.charAt(0))) {
error = 'First character must be a letter.'; error = 'First character must be a letter.';
} else { } else {
var lowerName = name.toLowerCase().trim();
for (var i = 0; i < Constants.RESERVED_USERNAMES.length; i++) { for (var i = 0; i < Constants.RESERVED_USERNAMES.length; i++) {
if (lowerName === Constants.RESERVED_USERNAMES[i]) { if (name === Constants.RESERVED_USERNAMES[i]) {
error = 'Cannot use a reserved word as a username.'; error = 'Cannot use a reserved word as a username.';
break; break;
} }