fixes #2013

raspberrypi · Sep 14, 2021 · 2a58a7c · 2a58a7c
1 parent 4bd9bcd
commit 2a58a7c
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 8 deletions.
diff --git a/jekyll-assets/_includes/nav.html b/jekyll-assets/_includes/nav.html
@@ -9,8 +9,26 @@ <h3 class="contentshead" onclick="expandAndCollapse(this)">{{ item.title }}</h3>
       {% if item.sections[0] %}
         {% if page.url == item.path %}
         <div class="itemcontents" id="toc"></div>
+        <div class="itemcontents noJS">
+          <ul class="sectlevel1">
+            {% for entry in item.sections %}
+              <li>
+                <a href="{{ site.baseurl }}{{ item.path }}#{{ entry.anchor }}">{{ entry.heading }}</a>
+                {% if entry.subsections[0] %}
+                  <ul>
+                    {% for subentry in entry.subsections %}
+                      <li>
+                        <a href="{{ site.baseurl }}{{ item.path }}#{{ subentry.anchor }}">{{ subentry.heading }}</a>
+                      </li>
+                    {% endfor %}
+                  </ul>
+                {% endif %}
+              </li>
+            {% endfor %}
+          </ul>
+        </div>
         {% else %}
-        <div class="itemcontents hidden">
+        <div class="itemcontents">
           <ul class="sectlevel1">
             {% for entry in item.sections %}
               <li>

diff --git a/jekyll-assets/css/style.css b/jekyll-assets/css/style.css
@@ -155,7 +155,7 @@ nav#contents {
 }
 
 nav#contents {
-  overflow-y: hidden;
+  overflow-y: auto;
 }
 
 nav#mobile-contents {

diff --git a/jekyll-assets/scripts/nav.js b/jekyll-assets/scripts/nav.js
@@ -1,6 +1,10 @@
 function addClassJS(element, myclass) {
-  var classes = element.className.split(" ");
-  console.log(classes);
+  var classes = element.className;
+  if (classes) {
+    classes = classes.split(" ");
+  } else {
+    classes = [];
+  }
   var i = classes.indexOf(myclass);
   if (i < 0) {
     classes.push(myclass);
@@ -9,8 +13,12 @@ function addClassJS(element, myclass) {
 }
 
 function removeClassJS(element, myclass) {
-  var classes = element.className.split(" ");
-  console.log(classes);
+  var classes = element.className;
+  if (classes) {
+    classes = classes.split(" ");
+  } else {
+    classes = [];
+  }
   var i = classes.indexOf(myclass);
   if (i >= 0) {
     classes.splice(i, 1);
@@ -21,7 +29,12 @@ function removeClassJS(element, myclass) {
 function expandAndCollapse(e) {
   var toExpand = e.nextElementSibling;
   if (toExpand) {
-    var classes = toExpand.className.split(" ");
+    var classes = toExpand.className;
+    if (classes) {
+      classes = classes.split(" ");
+    } else {
+      classes = [];
+    }
     var currentState = classes.indexOf("hidden");
 
     var expanded = document.querySelectorAll('div.itemcontents:not(.hidden)');
@@ -40,7 +53,12 @@ function expandAndCollapseMobile(e) {
   var toExpand = e.nextElementSibling;
   var parent = e.parentNode;
   if (toExpand) {
-    var classes = toExpand.className.split(" ");
+    var classes = toExpand.className;
+    if (classes) {
+      classes = classes.split(" ");
+    } else {
+      classes = [];
+    }
     var currentState = classes.indexOf("hidden");
 
     if (currentState > -1) {
@@ -52,3 +70,14 @@ function expandAndCollapseMobile(e) {
     }
   }
 }
+
+window.addEventListener('load', function() {
+  var tocitems = document.querySelectorAll("div.itemcontents:not(#toc)");
+  for (var i=0; i < tocitems.length; i++) {
+    addClassJS(tocitems[i], "hidden");
+  }
+  var currentItemNoJS = document.querySelectorAll("div.itemcontents.noJS");
+  addClassJS(currentItemNoJS, "hidden");
+  var contents = document.getElementById("contents");
+  contents.style.overflowY = 'hidden';
+});