fix: chaos caused by unreset .Scratch

reuixiy · Dec 7, 2019 · 3e862b4 · 3e862b4
1 parent d4edbff
commit 3e862b4
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 3 deletions.
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
@@ -14,16 +14,17 @@ <h1 class="list-title">{{ .Title | default .Data.Term | default (delimit (last 1
                         {{ end }}
                     {{ end }}
 
+                    {{ .Scratch.Delete "pages" }}
+
                     <!-- Section -->
                     {{ if (eq .Kind "section") }}
                         <!-- Archives -->
                         {{ if (eq .Section "archives") }}
                             {{ $pages := (where .Site.RegularPages "Section" "in" .Site.Params.mainSections) }}
-                            {{ $.Scratch.Set "pages" $pages }}
+                            {{ .Scratch.Set "pages" $pages }}
                         <!-- Regular Section -->
                         {{ else }}
                             {{ $sectionPage := .CurrentSection }}
-                            {{ .Scratch.Delete "pages" }}
                             {{ range .Site.RegularPages }}
                                 {{ if (.IsDescendant $sectionPage) }}
                                     {{ $.Scratch.Add "pages" (slice .) }}
@@ -46,11 +47,13 @@ <h1 class="list-title">{{ .Title | default .Data.Term | default (delimit (last 1
                     {{ $pages := .Scratch.Get "pages" }}
                     {{ range $pages.GroupByDate "2006" }}
                         <ul class="list-part">
+                            {{ $.Scratch.Delete "zodiacName" }}
                             {{ if $.Site.Params.chineseZodiac }}
                                 {{ $zodiacName := (index $.Site.Data.ChineseZodiac (string (mod .Key 12))) }}
                                 {{ $.Scratch.Set "zodiacName" $zodiacName }}
                             {{ end }}
                             {{ $zodiacName := $.Scratch.Get "zodiacName" }}
+                            {{ $.Scratch.Delete "year" }}
                             {{ if $.Site.Params.i18nYear }}
                                 {{ $key := .Key }}
                                 {{ $.Scratch.Delete "num" }}
@@ -71,6 +74,7 @@ <h1 class="list-title">{{ .Title | default .Data.Term | default (delimit (last 1
                             <h2 class="list-year">{{ $year }}{{ if $.Site.Params.chineseZodiac }}{{ replace (index $.Site.Data.SVG $zodiacName) "icon" "icon chinese-zodiac" | safeHTML }}{{ end }}</h2>
                             {{ if $.Site.Params.groupByMonth }}
                                 {{ range .Pages.GroupByDate "January" }}
+                                    {{ $.Scratch.Delete "month" }}
                                     {{ if $.Site.Params.i18nMonth }}
                                         {{ $month := i18n (lower .Key) }}
                                         {{ $.Scratch.Set "month" $month }}

diff --git a/layouts/partials/components/author.html b/layouts/partials/components/author.html
@@ -1,3 +1,4 @@
+{{- .Scratch.Delete "author" -}}
 {{- if .Params.original | default .Site.Params.original -}}
     {{- with .Site.Author.name -}}
         {{- $.Scratch.SetInMap "author" "name" . -}}

diff --git a/layouts/partials/components/auto-detect-images.html b/layouts/partials/components/auto-detect-images.html
@@ -6,6 +6,7 @@
     {{- with $imgs -}}
         {{- $.Scratch.Delete "imgsURL" -}}
         {{- range . -}}
+            {{- $.Scratch.Delete "replacement" -}}
             {{- if and $.Site.Params.enableImageHost $.Site.Params.headAlso -}}
                 {{- if (eq hugo.Environment "production") -}}
                     {{- $url := replaceRE `<img src="/?([^"]+)` `$1` . -}}

diff --git a/layouts/partials/components/data-attributes.html b/layouts/partials/components/data-attributes.html
@@ -1,9 +1,11 @@
 <!-- Small Caps -->
+{{- .Scratch.Delete "smallCaps" -}}
 {{- if .Params.smallCaps | default .Site.Params.enableSmallCaps -}}
     {{- .Scratch.Set "smallCaps" true -}}
 {{- end -}}
 
 <!-- Align -->
+{{- .Scratch.Delete "align" -}}
 {{- with .Params.align | default "default" -}}
     {{- if eq . "justify" -}}
         {{- $.Scratch.Set "align" "justify" -}}
@@ -17,11 +19,13 @@
 {{- end -}}
 
 <!-- Type: poetry -->
+{{- .Scratch.Delete "type" -}}
 {{- if and (eq .Type "poetry") .IsPage -}}
     {{- $.Scratch.Set "type" "poetry" -}}
 {{- end -}}
 
 <!-- Paragraph Indent -->
+{{- .Scratch.Delete "indent" -}}
 {{- if ne .Type "poetry" -}}
     {{- if (and .Site.Params.enableParagraphIndent .Params.indent) | default (and .Site.Params.enableParagraphIndent (eq .Site.Params.paragraphStyle "indent")) -}}
         {{- .Scratch.Set "indent" true -}}

diff --git a/layouts/partials/components/date.html b/layouts/partials/components/date.html
@@ -1,10 +1,12 @@
+{{- $.Scratch.Delete "pubDate" -}}
 {{- if .PublishDate.IsZero -}}
     {{- $pubDate := dateFormat "2006-01-02T15:04:05-07:00" (time .Site.Params.siteCreatedTime) -}}
     {{- $.Scratch.Set "pubDate" $pubDate -}}
 {{- else -}}
     {{- $pubDate := .PublishDate.Format "2006-01-02T15:04:05-07:00" -}}
     {{- $.Scratch.Set "pubDate" $pubDate -}}
 {{- end -}}
+{{- $.Scratch.Delete "modDate" -}}
 {{- if .Lastmod.IsZero -}}
     {{- $modDate := dateFormat "2006-01-02T15:04:05-07:00" (time .Site.Params.siteCreatedTime) -}}
     {{- $.Scratch.Set "modDate" $modDate -}}

diff --git a/layouts/partials/components/keywords.html b/layouts/partials/components/keywords.html
@@ -22,8 +22,8 @@
     {{- $.Scratch.Add "keywordsSite" (printf "%s, " .) -}}
 {{- end -}}
 <!-- keywordsPost -->
+{{- $.Scratch.Delete "keywordsPost" -}}
 {{- if .IsPage -}}
-    {{- $.Scratch.Delete "keywordsPost" -}}
     {{- range $taxonomy, $terms := .Site.Taxonomies -}}
         {{- with $.Param $taxonomy -}}
             {{- range $index, $term := . -}}

diff --git a/layouts/partials/dark-mode.html b/layouts/partials/dark-mode.html
@@ -6,6 +6,7 @@
             {{ $.Scratch.Set "text" "🌙" }}
         {{ end }}
         {{ $text := $.Scratch.Get "text" }}
+        {{- $.Scratch.Delete "hide" -}}
         {{- if or (and $.IsHome $.Site.Params.hideThemeToggleInHome) (and (not $.IsHome) $.Site.Params.hideThemeToggle) -}}
             {{- $.Scratch.Set "hide" true -}}
         {{- end -}}

diff --git a/layouts/partials/minimal-footer.html b/layouts/partials/minimal-footer.html
@@ -70,6 +70,7 @@
             {{ with .Params.categories }}
                 <div class="post-category">
                     {{ if eq (len $.Site.Taxonomies.categories) 2 }}
+                        {{- $.Scratch.Delete "categoryNow" -}}
                         {{- range . -}}
                             {{- $categoryNow := (. | urlize) -}}
                             {{- $.Scratch.Set "categoryNow" $categoryNow -}}

diff --git a/layouts/partials/multilingual.html b/layouts/partials/multilingual.html
@@ -1,4 +1,5 @@
 {{ if and .Site.IsMultiLingual .Site.Params.enableLangToggle }}
+    {{- .Scratch.Delete "hide" -}}
     {{- if .IsHome -}}
         {{- if .Site.Params.hideLangToggleInHome -}}
             {{- .Scratch.Set "hide" true -}}