From cc7b6c7999bf640ed30f91253636b0598bc53516 Mon Sep 17 00:00:00 2001
From: Lam Nguyen <la.nguyen@f5.com>
Date: Fri, 24 Jan 2025 05:12:17 -0800
Subject: [PATCH 1/3] feat: added JS to automatically open sidebar v2 to
 current page

---
 assets/js/sidebar-v2.js                  | 17 +++++++++++++++++
 layouts/partials/scripts.html            |  4 ++++
 layouts/partials/sidebar-list-pages.html |  2 +-
 layouts/partials/sidebar-v2.html         |  2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 assets/js/sidebar-v2.js

diff --git a/assets/js/sidebar-v2.js b/assets/js/sidebar-v2.js
new file mode 100644
index 0000000..c3c9509
--- /dev/null
+++ b/assets/js/sidebar-v2.js
@@ -0,0 +1,17 @@
+document.addEventListener("DOMContentLoaded", function() {
+    function expandToCurrentPage() {
+        var currentPage = document.getElementById("current-page");
+        if (currentPage) {
+            var parentLabel = currentPage.closest("li");
+            while (parentLabel) {
+                var checkbox = parentLabel.querySelector(".toggle-checkbox");
+                if (checkbox) {
+                    checkbox.checked = true;
+                }
+                parentLabel = parentLabel.closest("ul").closest("li");
+            }
+        }
+    }
+
+    expandToCurrentPage();
+})
\ No newline at end of file
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 8126238..2ad3927 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -68,3 +68,7 @@
 <!-- Load Product Selector javascript -->
 {{ $jsProductSelector := resources.Get "js/product-selector.js" | minify | fingerprint "sha512" }}
 <script src="{{ $jsProductSelector.RelPermalink }}" type="text/javascript" integrity="{{ $jsProductSelector.Data.Integrity }}"></script>
+
+<!-- Load Sidebar v2 javascript -->
+{{ $jsSidebarV2 := resources.Get "js/sidebar-v2.js" | minify | fingerprint "sha512" }}
+<script src="{{ $jsSidebarV2.RelPermalink }}" type="text/javascript" integrity="{{ $jsSidebarV2.Data.Integrity }}"></script>
\ No newline at end of file
diff --git a/layouts/partials/sidebar-list-pages.html b/layouts/partials/sidebar-list-pages.html
index b221b25..cc158d5 100644
--- a/layouts/partials/sidebar-list-pages.html
+++ b/layouts/partials/sidebar-list-pages.html
@@ -15,7 +15,7 @@
             {{ partial "sidebar-list-pages.html" (dict "context" . "currentUrl" $currentUrl) }}
         {{ else if eq .Kind "page" }}
             {{ if eq $currentUrl .Permalink }}                      
-                <span class="box current partial"></span>                 
+                <span class="box current partial" id="current-page"></span>                 
             {{ else }}                     
                 <span class="box-link partial"></span>              
             {{ end }}
diff --git a/layouts/partials/sidebar-v2.html b/layouts/partials/sidebar-v2.html
index 894e544..bc4f3c9 100644
--- a/layouts/partials/sidebar-v2.html
+++ b/layouts/partials/sidebar-v2.html
@@ -37,7 +37,7 @@
             <ul>
             {{ range $products }}
                 <li>
-                    <a href="{{ .url }}" target="_blank">{{ .title }}</a>
+                    <a href="{{ .url }}">{{ .title }}</a>
                 </li>
             {{ end }}
             </ul>

From be0c608b58257b61c6828c7e7ef4ad3f8ca1400a Mon Sep 17 00:00:00 2001
From: Lam Nguyen <la.nguyen@f5.com>
Date: Fri, 24 Jan 2025 06:50:46 -0800
Subject: [PATCH 2/3] small tweaks

---
 assets/js/sidebar-v2.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/sidebar-v2.js b/assets/js/sidebar-v2.js
index c3c9509..6dcf536 100644
--- a/assets/js/sidebar-v2.js
+++ b/assets/js/sidebar-v2.js
@@ -1,8 +1,8 @@
 document.addEventListener("DOMContentLoaded", function() {
     function expandToCurrentPage() {
-        var currentPage = document.getElementById("current-page");
+        const currentPage = document.getElementById("current-page");
         if (currentPage) {
-            var parentLabel = currentPage.closest("li");
+            let parentLabel = currentPage.closest("li");
             while (parentLabel) {
                 var checkbox = parentLabel.querySelector(".toggle-checkbox");
                 if (checkbox) {

From 97e71253ade2bd04d53cd0bc1d0a57e256367b26 Mon Sep 17 00:00:00 2001
From: Jack Hickey <133868041+nginx-jack@users.noreply.github.com>
Date: Fri, 24 Jan 2025 16:21:00 +0000
Subject: [PATCH 3/3] fix var usage

Co-authored-by: Alan Dooley <a.dooley@f5.com>
---
 assets/js/sidebar-v2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/sidebar-v2.js b/assets/js/sidebar-v2.js
index 6dcf536..b90ce91 100644
--- a/assets/js/sidebar-v2.js
+++ b/assets/js/sidebar-v2.js
@@ -4,7 +4,7 @@ document.addEventListener("DOMContentLoaded", function() {
         if (currentPage) {
             let parentLabel = currentPage.closest("li");
             while (parentLabel) {
-                var checkbox = parentLabel.querySelector(".toggle-checkbox");
+                let checkbox = parentLabel.querySelector(".toggle-checkbox");
                 if (checkbox) {
                     checkbox.checked = true;
                 }