fix two annoying bugs

sky-is-winning · Aug 5, 2024 · f0c03a2 · f0c03a2
1 parent d7f1350
commit f0c03a2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/generate-page-data.js b/src/generate-page-data.js
@@ -374,7 +374,7 @@ function hideNav() {
                         <div class="mw-parser-output">
                        <meta property="mw:PageProp/toc">
         `;
-        contentContainer += await this.getContentFromWikiText(wt, pageName);
+        contentContainer += pageName.startsWith("templates/") ? await this.getTemplate(pageName.split("templates/")[1], pageName, true) : await this.getContentFromWikiText(wt, pageName);
         contentContainer += `</div></main>`;
         contentContainer += this.getFooter();
         contentContainer += `</div></div></div>`;
@@ -409,10 +409,10 @@ function hideNav() {
         return body;
     }
 
-    async getTemplate(template, pageName) {
+    async getTemplate(template, pageName, bypassNoInclude = false) {
         if (template == "BASEPAGENAME") {
             return pageName;
         }
-        return await this.templateGenerator.generateTemplate(template, true);
+        return await this.templateGenerator.generateTemplate(template, bypassNoInclude);
     }
 }
diff --git a/src/generate-template.js b/src/generate-template.js
@@ -63,6 +63,7 @@ export default class GenerateTemplate {
             let listContent = boxData[list];
             navbox += `<td style="text-align:left;border-left-width:2px;border-left-style:solid;width:100%;padding:0px;;;" class="navbox-list navbox-${id % 2 == 0 ? "even" : "odd"}"><div style="padding:0em 0.25em">${listContent}</div></td>`;
         }
+        navbox += `</tbody></table></td></tr></tbody></table>`;
 
         return navbox;
     }
@@ -353,7 +354,7 @@ export default class GenerateTemplate {
     }
 
     async generateTemplateFromWikitext(wikitext, data, bypassNoInclude) {
-        if (!bypassNoInclude) wikitext = wikitext.replace(/<noinclude>[\s\S]*?<\/noinclude>|<noinclude>[\s\S]*?(?=<noinclude>|$)/g, "");
+        if (!bypassNoInclude) wikitext = wikitext.replace(/<noinclude>[\s\S]*?<\/noinclude>|<noinclude>[\s\S]*?(?=<\/noinclude>|$)/g, "");
 
         var dataSwappers = {};
         data.forEach((item, index) => {