From 4b260b761a78ea1a0dd6b02df7d25e93b496b6ff Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Thu, 12 May 2016 07:50:53 -0400
Subject: Updating client dependancies and ESLint (#2954)

* Updating client dependancies

* Fixing eslint errors with updates

* Updating eslint
---
 webapp/utils/text_formatting.jsx |  2 +-
 webapp/utils/utils.jsx           | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'webapp/utils')

diff --git a/webapp/utils/text_formatting.jsx b/webapp/utils/text_formatting.jsx
index 96b51d632..623fe0660 100644
--- a/webapp/utils/text_formatting.jsx
+++ b/webapp/utils/text_formatting.jsx
@@ -318,7 +318,7 @@ function parseSearchTerms(searchTerm) {
             termString = termString.substring(captured[0].length);
 
             // break the text up into words based on how the server splits them in SqlPostStore.SearchPosts and then discard empty terms
-            terms.push(...captured[0].split(/[ <>+\-\(\)\~\@]/).filter((term) => !!term));
+            terms.push(...captured[0].split(/[ <>+\-\(\)~@]/).filter((term) => !!term));
             continue;
         }
 
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index 2f728226c..1f52bb451 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -457,7 +457,7 @@ export function replaceHtmlEntities(text) {
     };
     var newtext = text;
     for (var tag in tagsToReplace) {
-        if ({}.hasOwnProperty.call(tagsToReplace, tag)) {
+        if (Reflect.apply({}.hasOwnProperty, this, [tagsToReplace, tag])) {
             var regex = new RegExp(tag, 'g');
             newtext = newtext.replace(regex, tagsToReplace[tag]);
         }
@@ -473,7 +473,7 @@ export function insertHtmlEntities(text) {
     };
     var newtext = text;
     for (var tag in tagsToReplace) {
-        if ({}.hasOwnProperty.call(tagsToReplace, tag)) {
+        if (Reflect.apply({}.hasOwnProperty, this, [tagsToReplace, tag])) {
             var regex = new RegExp(tag, 'g');
             newtext = newtext.replace(regex, tagsToReplace[tag]);
         }
@@ -924,7 +924,7 @@ export function isValidUsername(name) {
         error = 'This field is required';
     } 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)) {
+    } 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
         error = 'First character must be a letter.';
@@ -977,7 +977,7 @@ Image.prototype.load = function imageLoad(url, progressCallback) {
     xmlHTTP.responseType = 'arraybuffer';
     xmlHTTP.onload = function onLoad() {
         var h = xmlHTTP.getAllResponseHeaders();
-        var m = h.match(/^Content-Type\:\s*(.*?)$/mi);
+        var m = h.match(/^Content-Type:\s*(.*?)$/mi);
         var mimeType = m[1] || 'image/png';
 
         var blob = new Blob([this.response], {type: mimeType});
@@ -1142,7 +1142,7 @@ export function generateId() {
     // implementation taken from http://stackoverflow.com/a/2117523
     var id = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
 
-    id = id.replace(/[xy]/g, function replaceRandom(c) {
+    id = id.replace(/[xy]/g, (c) => {
         var r = Math.floor(Math.random() * 16);
 
         var v;
-- 
cgit v1.2.3-1-g7c22