diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-09-14 14:45:33 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-09-14 14:45:33 -0400 |
commit | 312f7d76563856ea877bc930100501aef803d078 (patch) | |
tree | be8388715707578b43ffd0b27c91181ba24e0511 | |
parent | 125b7dc71bb3ef00dc038632bf71737e5d25158b (diff) | |
parent | c961c529af28e4e90a0f433dd097e98781a4f112 (diff) | |
download | chat-312f7d76563856ea877bc930100501aef803d078.tar.gz chat-312f7d76563856ea877bc930100501aef803d078.tar.bz2 chat-312f7d76563856ea877bc930100501aef803d078.zip |
Merge pull request #674 from Trozz/PLT-41
PLT-41 Automatically convert uppercase letters to lowercase in username input box.
-rw-r--r-- | web/react/components/signup_user_complete.jsx | 2 | ||||
-rw-r--r-- | web/react/components/team_signup_username_page.jsx | 2 | ||||
-rw-r--r-- | web/react/components/user_settings_general.jsx | 2 | ||||
-rw-r--r-- | web/react/utils/utils.jsx | 6 |
4 files changed, 5 insertions, 7 deletions
diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx index f078f6169..6e71eae32 100644 --- a/web/react/components/signup_user_complete.jsx +++ b/web/react/components/signup_user_complete.jsx @@ -32,7 +32,7 @@ export default class SignupUserComplete extends React.Component { handleSubmit(e) { 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) { this.setState({nameError: 'This field is required', emailError: '', passwordError: '', serverError: ''}); return; diff --git a/web/react/components/team_signup_username_page.jsx b/web/react/components/team_signup_username_page.jsx index b5c8b14df..984c7afab 100644 --- a/web/react/components/team_signup_username_page.jsx +++ b/web/react/components/team_signup_username_page.jsx @@ -22,7 +22,7 @@ export default class TeamSignupUsernamePage extends React.Component { submitNext(e) { 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); if (usernameError === 'Cannot use a reserved word as a username.') { diff --git a/web/react/components/user_settings_general.jsx b/web/react/components/user_settings_general.jsx index 184534a9a..dd0abc8a5 100644 --- a/web/react/components/user_settings_general.jsx +++ b/web/react/components/user_settings_general.jsx @@ -40,7 +40,7 @@ export default class UserSettingsGeneralTab extends React.Component { e.preventDefault(); var user = this.props.user; - var username = this.state.username.trim(); + var username = this.state.username.trim().toLowerCase(); var usernameError = utils.isValidUsername(username); if (usernameError === 'Cannot use a reserved word as a username.') { diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 71cd1d344..54d05f484 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -828,14 +828,12 @@ export function isValidUsername(name) { } else if (name.length < 3 || name.length > 15) { error = 'Must be between 3 and 15 characters'; } 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))) { error = 'First character must be a letter.'; } else { - var lowerName = name.toLowerCase().trim(); - 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.'; break; } |