diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-01-21 09:59:38 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-01-21 09:59:38 -0500 |
| commit | 868eece9879131e9f2093a0e858533c9df76b55c (patch) | |
| tree | 5117de60eb860c6328a0e4a1dd4404a89252364b /web/react/utils | |
| parent | 2fdfdaeff7a0bf29fd21eec6d4f48abe579d5048 (diff) | |
| parent | 76f000056512d323febeb6c941e43efb438030ba (diff) | |
| download | chat-868eece9879131e9f2093a0e858533c9df76b55c.tar.gz chat-868eece9879131e9f2093a0e858533c9df76b55c.tar.bz2 chat-868eece9879131e9f2093a0e858533c9df76b55c.zip | |
Merge pull request #1927 from rgarmsen2295/plt-1668
PLT-1668 Removes duplicate short username error message
Diffstat (limited to 'web/react/utils')
| -rw-r--r-- | web/react/utils/constants.jsx | 6 | ||||
| -rw-r--r-- | web/react/utils/utils.jsx | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index d0f34293f..5d6aa9329 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -453,5 +453,9 @@ export default { description: 'Show preview snippet of links below message' } }, - OVERLAY_TIME_DELAY: 400 + OVERLAY_TIME_DELAY: 400, + MIN_USERNAME_LENGTH: 3, + MAX_USERNAME_LENGTH: 15, + MIN_PASSWORD_LENGTH: 5, + MAX_PASSWORD_LENGTH: 50 }; diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index db469952b..32373b4a3 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -879,8 +879,8 @@ export function isValidUsername(name) { var error = ''; if (!name) { error = 'This field is required'; - } else if (name.length < 3 || name.length > 15) { - error = 'Must be between 3 and 15 characters'; + } else if (name.length < Constants.MIN_USERNAME_LENGTH || name.length > Constants.MAX_USERNAME_LENGTH) { + error = 'Must be between ' + Constants.MIN_USERNAME_LENGTH + ' and ' + Constants.MAX_USERNAME_LENGTH + ' characters'; } else if (!(/^[a-z0-9\.\-\_]+$/).test(name)) { error = "Must contain only letters, numbers, and the symbols '.', '-', and '_'."; } else if (!(/[a-z]/).test(name.charAt(0))) { //eslint-disable-line no-negated-condition |