From 300cc282e4ad95bb9ee8fdbdf77f9d4d5df8279a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= <maxi_kroeg@web.de>
Date: Sun, 9 Feb 2020 18:12:24 +0100
Subject: [PATCH] Generate valid html for the apidoc navigation

Only `<li>` can be a direct descendant of `<ul>` tags.
---
 config/jsdoc/api/template/static/scripts/main.js   | 10 +++++-----
 config/jsdoc/api/template/static/styles/jaguar.css |  2 +-
 config/jsdoc/api/template/tmpl/navigation.tmpl     | 14 ++++++++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/config/jsdoc/api/template/static/scripts/main.js b/config/jsdoc/api/template/static/scripts/main.js
index 22bcad9dff..97dfd0facf 100644
--- a/config/jsdoc/api/template/static/scripts/main.js
+++ b/config/jsdoc/api/template/static/scripts/main.js
@@ -33,7 +33,7 @@ $(function () {
 
     if (value && value.length > 1) {
       var regexp = new RegExp(value, 'i');
-      $el.find('li, .itemMembers').hide();
+      $el.find('li, .member-list').hide();
 
       $el.find('li').each(function (i, v) {
         const $item = $(v);
@@ -41,7 +41,7 @@ $(function () {
 
         if (name && regexp.test(name)) {
           const $classEntry = $item.closest('.item');
-          const $members = $item.closest('.itemMembers');
+          const $members = $item.closest('.member-list');
 
           // Do the weight thing
           $classEntry.removeData('weight');
@@ -60,7 +60,7 @@ $(function () {
         .appendTo(".navigation ul.list"); // append again to the list
 
     } else {
-      $el.find('.item, .itemMembers').show();
+      $el.find('.item, .member-list').show();
     }
 
     $el.find('.list').scrollTop(0);
@@ -68,7 +68,7 @@ $(function () {
 
   // Toggle when click an item element
   $('.navigation').on('click', '.toggle', function (e) {
-    $(this).parent().parent().find('.itemMembers').toggle();
+    $(this).parent().parent().find('.member-list').toggle();
   });
 
   // Show an item related a current documentation automatically
@@ -84,7 +84,7 @@ $(function () {
       .remove()
       .prependTo('.navigation .list')
       .show()
-      .find('.itemMembers')
+      .find('.member-list')
       .show();
   }
 
diff --git a/config/jsdoc/api/template/static/styles/jaguar.css b/config/jsdoc/api/template/static/styles/jaguar.css
index 2a105027ba..1a677bfa93 100644
--- a/config/jsdoc/api/template/static/styles/jaguar.css
+++ b/config/jsdoc/api/template/static/styles/jaguar.css
@@ -183,7 +183,7 @@ li {
   padding-left: 8px;
   margin-top: 2px;
 }
-.navigation li.item .itemMembers {
+.navigation li.item .member-list {
   display: none;
   padding-left: 8px;
 }
diff --git a/config/jsdoc/api/template/tmpl/navigation.tmpl b/config/jsdoc/api/template/tmpl/navigation.tmpl
index 1fb92b4b28..074e99672f 100644
--- a/config/jsdoc/api/template/tmpl/navigation.tmpl
+++ b/config/jsdoc/api/template/tmpl/navigation.tmpl
@@ -15,22 +15,24 @@ function getItemCssClass(type) {
 }
 
 const printList = v => { ?>
-                <li data-name="<?js= v.longname ?>"><?js
+                    <li data-name="<?js= v.longname ?>"><?js
 }
 const printListWithStability = v => {
     const cls = v.stability && v.stability !== 'stable' ? ' class="unstable"' : ''; ?>
-                <li data-name="<?js= v.longname ?>"<?js= cls ?>><?js
+                    <li data-name="<?js= v.longname ?>"<?js= cls ?>><?js
 }
 
 function listContent(item, title, listItemPrinter) {
     const type = title.toLowerCase();
     if (item[type] && item[type].length) { ?>
-            <ul class="<?js= type ?> itemMembers">
-                <span class="subtitle"><?js= title ?></span><?js
+            <div class="member-list">
+                <span class="subtitle"><?js= title ?></span>
+                <ul><?js
         item[type].forEach(function (v) {
             listItemPrinter(v); ?><?js= self.linkto(v.longname, toShortName(v.name)) ?><?js
-        }); ?>
-            </ul><?js
+         }); ?>
+                </ul>
+            </div><?js
     }
 }
 ?>