From 97e88c9d57c37e8d488d9bbf33fd6c3ebc27ee80 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@joost.at>
Date: Sun, 18 Apr 2021 13:16:37 +0200
Subject: [PATCH] fix(plugin-bartack): Linter warnings

---
 packages/plugin-bartack/src/bartack.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/plugin-bartack/src/bartack.js b/packages/plugin-bartack/src/bartack.js
index 7b491a54cfb..779d783b045 100644
--- a/packages/plugin-bartack/src/bartack.js
+++ b/packages/plugin-bartack/src/bartack.js
@@ -1,6 +1,6 @@
 const name = (n, so) => `${so.prefix}${n}${so.suffix}`
 
-const drawBartack = (points, so, self) => {
+const drawBartack = (points, self) => {
   let path = new self.Path().move(points.path1[0])
   for (let i in points.path1) {
     if (points.path1[i]) path = path.line(points.path1[i])
@@ -10,27 +10,25 @@ const drawBartack = (points, so, self) => {
   return path
 }
 
-const getPoints = (path, so, self) => {
+const getPoints = (path, so) => {
   let path1 = path.offset(so.width / 2)
   let path2 = path.offset(so.width / -2)
-  let len1 = path1.length()
+  let len = path1.length()
   let len2 = path2.length()
 
   // Make sure path1 is always the longest one
-  if (len2 > len1) {
+  if (len2 > len) {
     let tmp = path2
     path2 = path1
     path1 = tmp
-    tmp = len2
-    len2 = len1
-    len1 = tmp
+    len = len2
   }
 
   let points = {
     path1: [path1.start()],
     path2: [path2.start()]
   }
-  let steps = Math.ceil((len1 / so.width) * so.density)
+  let steps = Math.ceil((len / so.width) * so.density)
   for (let i = 1; i < steps; i++) {
     points.path1.push(path1.shiftFractionAlong((1 / steps) * i))
     points.path2.push(path2.shiftFractionAlong((1 / steps) * i))
@@ -39,8 +37,7 @@ const getPoints = (path, so, self) => {
   return points
 }
 
-const bartackPath = (path, so, self) =>
-  path ? drawBartack(getPoints(path, so, self), so, self) : null
+const bartackPath = (path, so, self) => (path ? drawBartack(getPoints(path, so), self) : null)
 
 export default function bartack(so, self) {
   const defaults = {
@@ -75,7 +72,7 @@ export default function bartack(so, self) {
     let end = false
     if (so.bartackAlong) {
       if (so.start > 0) start = so.path.shiftAlong(so.start)
-      if (end < so.path.length) end = so.path.shiftAlong(so.end)
+      if (!end || end < so.path.length) end = so.path.shiftAlong(so.end)
     } else if (so.bartackFractionAlong) {
       if (so.start > 0) start = so.path.shiftFractionAlong(so.start)
       if (so.end < 1) end = so.path.shiftFractionAlong(so.end)