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 /web/react/utils | |
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.
Diffstat (limited to 'web/react/utils')
-rw-r--r-- | web/react/utils/utils.jsx | 6 |
1 files changed, 2 insertions, 4 deletions
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; } |