From a1a5da928fbe4b8288c7e4614bc748fa6d01292c Mon Sep 17 00:00:00 2001
From: Vincent Rubinetti <vince.rubinetti@gmail.com>
Date: Tue, 2 Feb 2021 13:48:55 -0500
Subject: [PATCH] update

---
 build/plugins/lightbox.html | 16 ++++------------
 build/plugins/tooltips.html | 13 +++++--------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/build/plugins/lightbox.html b/build/plugins/lightbox.html
index 313cb3ba..1fbdf771 100644
--- a/build/plugins/lightbox.html
+++ b/build/plugins/lightbox.html
@@ -8,7 +8,7 @@
 
 <script type="module">
   // list of possible zoom/scale factors
-  const zoomSteps =
+  const zooms =
     "0.1, 0.25, 0.333333, 0.5, 0.666666, 0.75, 1, 1.25, 1.5, 1.75, 2, 2.5, 3, 3.5, 4, 5, 6, 7, 8";
   // whether to fit image to view ('fit'), display at 100% and shrink if
   // necessary ('shrink'), or always display at 100% ('100')
@@ -135,17 +135,9 @@
     img.style.maxHeight = "";
     img.id = "lightbox_img";
 
-    // build sorted list of unique zoomSteps, always including a 100%
-    let zoomSteps = [];
-    const optionsZooms = zoomSteps.split(/[^0-9.]/);
-    for (const optionZoom of optionsZooms) {
-      const newZoom = parseFloat(optionZoom);
-      if (newZoom && !zoomSteps.includes(newZoom)) zoomSteps.push(newZoom);
-    }
-    if (!zoomSteps.includes(1)) zoomSteps.push(1);
-    zoomSteps = zoomSteps.sort(function sortNumber(a, b) {
-      return a - b;
-    });
+    // build sorted list of zoomSteps
+    const zoomSteps = zooms.split(/[^0-9.]/).map((step) => parseFloat(step));
+    zoomSteps.sort((a, b) => a - b);
 
     // <img> object property variables
     let zoom = 1;
diff --git a/build/plugins/tooltips.html b/build/plugins/tooltips.html
index 9b5ac519..140db312 100644
--- a/build/plugins/tooltips.html
+++ b/build/plugins/tooltips.html
@@ -38,7 +38,7 @@
     }.bind(this);
 
     // run open function after delay
-    this.openTooltipTimer = window.setTimeout(delayOpenTooltip, options.delay);
+    this.openTooltipTimer = window.setTimeout(delayOpenTooltip, delay);
   }
 
   // when mouse leaves link
@@ -47,7 +47,7 @@
     window.clearTimeout(this.openTooltipTimer);
 
     // don't close on unhover if option specifies
-    if (options.clickClose === "true") return;
+    if (clickClose === "true") return;
 
     // function to close tooltip
     const delayCloseTooltip = function () {
@@ -57,10 +57,7 @@
     };
 
     // run close function after delay
-    this.closeTooltipTimer = window.setTimeout(
-      delayCloseTooltip,
-      options.delay
-    );
+    this.closeTooltipTimer = window.setTimeout(delayCloseTooltip, delay);
   }
 
   // when link is focused (tabbed to)
@@ -253,7 +250,7 @@
 
   // when tooltip is unhovered
   function onTooltipUnhover(event) {
-    if (options.clickClose === "true") return;
+    if (clickClose === "true") return;
 
     // make sure new mouse/touch/focus no longer over tooltip or any
     // element within it
@@ -354,7 +351,7 @@
   // scroll to and focus element
   function goToElement(element, offset) {
     // expand accordion section if collapsed
-    expandElement(element);
+    expandHeading(element);
     const y =
       getRectInView(element).top -
       getRectInView(document.documentElement).top -