fix: correct the TOC if conditions

razonyang · Nov 14, 2022 · a29c019 · a29c019
1 parent e956f98
commit a29c019
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/layouts/partials/functions/toc.html b/layouts/partials/functions/toc.html
@@ -0,0 +1,4 @@
+{{- $enable := and (default true .Params.toc) (default true .Site.Params.toc) -}}
+{{- $toc := .TableOfContents -}}
+{{- $valid := and $toc (and (ne $toc "<nav id=\"TableOfContents\"></nav>") (gt .WordCount .Site.Params.tocWordCount)) -}}
+{{- return and $enable $valid -}}
diff --git a/layouts/partials/post/panel/toc.html b/layouts/partials/post/panel/toc.html
@@ -1,7 +1,4 @@
-{{- $enable := and (default true .Params.toc) (default true .Site.Params.toc) -}}
-{{- $toc := .TableOfContents -}}
-{{- $valid := and $toc (and (ne $toc "<nav id=\"TableOfContents\"></nav>") (gt .WordCount .Site.Params.tocWordCount)) -}}
-{{- if and $enable $valid -}}
+{{- if partial "functions/toc" . -}}
 <a class="action action-toc{{ if eq .Type "docs" }} d-lg-none{{ end }}" href="#postTOC" aria-controls="Table of contents" role="button" title="Table of contents">
   <i class="fas fa-fw fa-list-alt"></i>
 </a>

diff --git a/layouts/partials/post/toc-wrapper.html b/layouts/partials/post/toc-wrapper.html
@@ -1,4 +1,6 @@
+{{- if partial "functions/toc" . -}}
 <div id="postTOC" class="mt-2 mb-4 d-block d-lg-none">
     <h2 class="text-surface mb-3">{{ i18n "table_of_contents" }}</h2>
     <div id="post-toc-container"></div>
 </div>
+{{- end -}}
diff --git a/layouts/partials/post/toc.html b/layouts/partials/post/toc.html
@@ -1,12 +1,9 @@
-{{- $enable := and (default true .Params.toc) (default true .Site.Params.toc) -}}
-{{- $toc := .TableOfContents -}}
-{{- $valid := and $toc (and (ne $toc "<nav id=\"TableOfContents\"></nav>") (gt .WordCount .Site.Params.tocWordCount)) -}}
-{{- if and $enable $valid -}}
+{{- if partial "functions/toc" . -}}
 <div id="postTOC">
   <h2 class="mb-3">
     {{- i18n "table_of_contents" -}}
     <a class="anchor ms-1" href="#postTOC"><i class="fas fa-link"></i></a>
   </h2>
-  {{ $toc }}
+  {{ .TableOfContents }}
 </div>
 {{- end -}}
diff --git a/layouts/partials/sidebar/toc.html b/layouts/partials/sidebar/toc.html
@@ -1,7 +1,4 @@
-{{- $enable := and (default true .Params.toc) (default true .Site.Params.toc) -}}
-{{- $toc := .TableOfContents -}}
-{{- $valid := and $toc (and (ne $toc "<nav id=\"TableOfContents\"></nav>") (gt .WordCount .Site.Params.tocWordCount)) -}}
-{{- if and $enable $valid -}}
+{{- if partial "functions/toc" . -}}
 <div class="accordion post-toc d-none d-lg-block">
   <div class="accordion-item row mb-4 card component" id="postTOC">
     <div class="card-header accordion-header">
@@ -11,7 +8,7 @@ <h2 class="card-title fs-4 my-2 text-surface d-none d-lg-block">{{ i18n "table_o
       </a>
     </div>
     <div class="card-body collapse accordion-collapse accordion-body d-lg-block" id="post-toc" aria-labelledby="post-toc-header">
-      {{ $toc }}
+      {{ .TableOfContents }}
     </div>
   </div>
 </div>