From d67220680015068e3fbda7d94345630102469ca5 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Fri, 6 Dec 2019 07:41:25 +0100
Subject: Update JS dependencies (#9255)

This is the result of `make npm-update`. I also fixed a minor linting
issue which came up with the eslint 6.7 update.
---
 web_src/js/gitGraph.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'web_src')

diff --git a/web_src/js/gitGraph.js b/web_src/js/gitGraph.js
index 59083fe569..12d7a2eddf 100644
--- a/web_src/js/gitGraph.js
+++ b/web_src/js/gitGraph.js
@@ -250,16 +250,14 @@ export default function gitGraph(canvas, rawGraphList, config) {
           }
         }
 
-        /* eslint-disable-next-line */
         if (condensePrevLength < condenseCurrentLength
-          && ((nodePos = findColomn('*', currentRow)) !== -1
+          && ((nodePos = findColomn('*', currentRow)) !== -1 // eslint-disable-line no-cond-assign
           && (findColomn('_', currentRow) === -1))) {
           flows.splice(nodePos - 1, 0, genNewFlow());
         }
 
-        /* eslint-disable-next-line */
         if (prevRowLength > currentRow.length
-          && (nodePos = findColomn('*', prevRow)) !== -1) {
+          && (nodePos = findColomn('*', prevRow)) !== -1) { // eslint-disable-line no-cond-assign
           if (findColomn('_', currentRow) === -1
             && findColomn('/', currentRow) === -1
             && findColomn('\\', currentRow) === -1) {
-- 
cgit v1.2.3