diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-05 16:02:09 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-05 16:02:09 -0400 |
| commit | e2e00d9d43c14806cd5a5c424b9879636dfd89c8 (patch) | |
| tree | 607e55539a4827382bfdc331400885fdd073922c /web/react/utils/utils.jsx | |
| parent | 193732ffbf1107fd146412ce38a053354d972e25 (diff) | |
| parent | 33b957ed1a8a44d4bed0f9c674d5602bad5028ea (diff) | |
| download | chat-e2e00d9d43c14806cd5a5c424b9879636dfd89c8.tar.gz chat-e2e00d9d43c14806cd5a5c424b9879636dfd89c8.tar.bz2 chat-e2e00d9d43c14806cd5a5c424b9879636dfd89c8.zip | |
Merge pull request #922 from mattermost/plt-360
PLT-360 Upgrade and changes to ESLint
Diffstat (limited to 'web/react/utils/utils.jsx')
| -rw-r--r-- | web/react/utils/utils.jsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 1bc082175..e2a95034f 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -231,10 +231,10 @@ function testUrlMatch(text) { var matchText = match.getMatchedText(); linkData.text = matchText; - if (matchText.trim().indexOf('http') !== 0) { - linkData.link = 'http://' + matchText; - } else { + if (matchText.trim().indexOf('http') === 0) { linkData.link = matchText; + } else { + linkData.link = 'http://' + matchText; } result.push(linkData); @@ -640,7 +640,7 @@ export function isValidUsername(name) { error = 'Must be between 3 and 15 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))) { + } else if (!(/[a-z]/).test(name.charAt(0))) { //eslint-disable-line no-negated-condition error = 'First character must be a letter.'; } else { for (var i = 0; i < Constants.RESERVED_USERNAMES.length; i++) { |