From 33b957ed1a8a44d4bed0f9c674d5602bad5028ea Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 5 Oct 2015 09:58:42 -0400 Subject: Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. Adding new ESLint rules. Fixing new ESLint errors. --- web/react/utils/utils.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'web/react/utils/utils.jsx') 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++) { -- cgit v1.2.3-1-g7c22