From 2ea592b4a35791e3546c984a30fea98631cd92a6 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Fri, 23 Feb 2024 20:50:52 +0800 Subject: [PATCH] :bug: Fix: use function to get params replace of .Scatch (#420) --- layouts/_default/_markup/render-heading.html | 2 +- layouts/_default/_markup/render-image.html | 2 +- layouts/_default/baseof.html | 2 +- layouts/_default/single.html | 2 +- layouts/_default/single.md | 2 +- layouts/friends/single.html | 2 +- layouts/index.html | 2 +- layouts/index.rss.xml | 2 +- layouts/page/friends.html | 2 +- layouts/partials/assets.html | 2 +- layouts/partials/function/params.html | 2 ++ layouts/partials/head/meta.html | 2 +- layouts/partials/head/seo.html | 2 +- layouts/partials/init/detection-env.html | 2 +- layouts/partials/init/index.html | 1 - layouts/partials/init/patch.html | 2 +- layouts/partials/plugin/image.html | 2 +- layouts/partials/plugin/share.html | 2 +- layouts/partials/single/collection-list.html | 2 +- layouts/partials/single/collection-nav.html | 2 +- layouts/partials/single/comment.html | 2 +- layouts/partials/single/expiration-reminder.html | 2 +- layouts/partials/single/fixit-decryptor.html | 4 ++-- layouts/partials/single/footer.html | 2 +- layouts/partials/single/related.html | 2 +- layouts/posts/single.html | 2 +- layouts/shortcodes/mapbox.html | 2 +- 27 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 layouts/partials/function/params.html diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html index 7a71f2ab..86760cf6 100644 --- a/layouts/_default/_markup/render-heading.html +++ b/layouts/_default/_markup/render-heading.html @@ -1,5 +1,5 @@ {{- /* Read the config and format */ -}} -{{- $params := .Page.Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} {{- $h1Format := $params.heading.number.format.h1 | default "{title}" -}} {{- $h2Format := $params.heading.number.format.h2 | default "{h2} {title}" -}} {{- $h3Format := $params.heading.number.format.h3 | default "{h2}.{h3} {title}" -}} diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html index 7f9382a0..23f2f897 100644 --- a/layouts/_default/_markup/render-image.html +++ b/layouts/_default/_markup/render-image.html @@ -6,6 +6,6 @@ {{- else -}} - {{- $linked := (eq (.Page.Scratch.Get "params").lightgallery "force") | or (ne .Title "") -}} + {{- $linked := (eq (partial "function/params.html").lightgallery "force") | or (ne .Title "") -}} {{- dict "Src" .Destination "Alt" .Text "Title" .Title "Linked" $linked "Responsive" true | partial "plugin/image.html" -}} {{- end -}} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index b08a33ca..a7dd0415 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -21,7 +21,7 @@ {{- /* Body wrapper */ -}} -
+
{{- partial "header.html" . -}} {{- partial "breadcrumb.html" . -}} {{- $toc := .Scratch.Get "toc" -}} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 85320622..81fea5e6 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -4,7 +4,7 @@ {{- end -}} {{- define "content" -}} - {{- $params := .Scratch.Get "params" -}} + {{- $params := partial "function/params.html" -}}
{{- /* Title */ -}} diff --git a/layouts/_default/single.md b/layouts/_default/single.md index 7fe4cff8..7a2d138b 100644 --- a/layouts/_default/single.md +++ b/layouts/_default/single.md @@ -1,4 +1,4 @@ -{{- $params := .Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} {{- $author := .Store.Get "author" -}} # {{ .Title }} diff --git a/layouts/friends/single.html b/layouts/friends/single.html index c069f7a5..0daa1a41 100644 --- a/layouts/friends/single.html +++ b/layouts/friends/single.html @@ -7,7 +7,7 @@ {{ end -}} {{- define "content" -}} -{{- $params := .Scratch.Get "params" -}} + {{- $params := partial "function/params.html" -}}
{{- /* Title */ -}} diff --git a/layouts/index.html b/layouts/index.html index 8e563b83..76c8e184 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -6,7 +6,7 @@ {{- end -}} {{- define "content" -}} - {{- $params := .Scratch.Get "params" -}} + {{- $params := partial "function/params.html" -}} {{- $profile := .Site.Params.home.profile -}} {{- $posts := .Site.Params.home.posts -}} diff --git a/layouts/index.rss.xml b/layouts/index.rss.xml index 56781f3d..2d80744e 100644 --- a/layouts/index.rss.xml +++ b/layouts/index.rss.xml @@ -37,7 +37,7 @@ {{ printf "" .Permalink .MediaType | safeHTML }} {{ end }} {{- range .Scratch.Get "mainSectionPages" | first (.Site.Params.home.rss | default 10) -}} - {{- $params := .Scratch.Get "params" -}} + {{- $params := partial "function/params.html" -}} {{- if $params.password | or $params.hiddenFromRss }}{{ continue }}{{ end -}} {{- dict "Page" . "Site" .Site | partial "rss/item.html" -}} {{- end -}} diff --git a/layouts/page/friends.html b/layouts/page/friends.html index c8bd9064..f3f2947d 100644 --- a/layouts/page/friends.html +++ b/layouts/page/friends.html @@ -4,7 +4,7 @@ {{- end -}} {{- define "content" -}} -{{- $params := .Scratch.Get "params" -}} + {{- $params := partial "function/params.html" -}}
{{- /* Title */ -}} diff --git a/layouts/partials/assets.html b/layouts/partials/assets.html index 6c3a1a2a..fcc5a310 100644 --- a/layouts/partials/assets.html +++ b/layouts/partials/assets.html @@ -1,4 +1,4 @@ -{{- $params := .Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} {{- $cdn := .Scratch.Get "cdn" | default dict -}} {{- $fingerprint := .Scratch.Get "fingerprint" -}} {{- $config := (.Scratch.Get "this").config -}} diff --git a/layouts/partials/function/params.html b/layouts/partials/function/params.html new file mode 100644 index 00000000..8ba6a0e8 --- /dev/null +++ b/layouts/partials/function/params.html @@ -0,0 +1,2 @@ +{{- $params := page.Params | merge site.Params.page -}} +{{- return $params -}} \ No newline at end of file diff --git a/layouts/partials/head/meta.html b/layouts/partials/head/meta.html index 6721ee87..dadc6cea 100644 --- a/layouts/partials/head/meta.html +++ b/layouts/partials/head/meta.html @@ -1,4 +1,4 @@ -{{- $params := .Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} diff --git a/layouts/partials/head/seo.html b/layouts/partials/head/seo.html index f1ba4e84..4df649d5 100644 --- a/layouts/partials/head/seo.html +++ b/layouts/partials/head/seo.html @@ -1,4 +1,4 @@ -{{- $params := .Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} {{- with .Site.Params.verification.google -}} diff --git a/layouts/partials/init/detection-env.html b/layouts/partials/init/detection-env.html index 46657ed5..fb989994 100644 --- a/layouts/partials/init/detection-env.html +++ b/layouts/partials/init/detection-env.html @@ -1,6 +1,6 @@ {{- /* FixIt theme environment detection */ -}} -{{- $params := .Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} {{- if hugo.IsProduction -}} {{- $cdn := .Site.Params.cdn -}} diff --git a/layouts/partials/init/index.html b/layouts/partials/init/index.html index b2259afc..1d6498db 100644 --- a/layouts/partials/init/index.html +++ b/layouts/partials/init/index.html @@ -1,5 +1,4 @@ {{- .Scratch.Set "version" "v0.3.3-RC" -}} -{{- .Scratch.Set "params" (.Params | merge .Site.Params.page) -}} {{- .Scratch.Set "this" (dict "version" (.Scratch.Get "version") | dict "config") -}} {{- partial "init/detection-env.html" . -}} diff --git a/layouts/partials/init/patch.html b/layouts/partials/init/patch.html index af3f71ec..cd302635 100644 --- a/layouts/partials/init/patch.html +++ b/layouts/partials/init/patch.html @@ -1,5 +1,5 @@ {{- /* FixIt theme patches */ -}} -{{- $params := .Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} {{- /* Toc data patch */ -}} {{- $toc := $params.toc -}} diff --git a/layouts/partials/plugin/image.html b/layouts/partials/plugin/image.html index 011e5bd2..d7ffaed2 100644 --- a/layouts/partials/plugin/image.html +++ b/layouts/partials/plugin/image.html @@ -1,4 +1,4 @@ -{{- $params := page.Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} {{- $class := .Class | default "" -}} {{- $style := "" -}} {{- $loading := .Loading | default "lazy" -}} diff --git a/layouts/partials/plugin/share.html b/layouts/partials/plugin/share.html index 6e23e378..74a76a63 100644 --- a/layouts/partials/plugin/share.html +++ b/layouts/partials/plugin/share.html @@ -1,4 +1,4 @@ -{{- $share := (.Scratch.Get "params").share | default dict -}} +{{- $share := (partial "function/params.html").share | default dict -}} {{- if $share.enable -}} {{- /* 001: Twitter */ -}} diff --git a/layouts/partials/single/collection-list.html b/layouts/partials/single/collection-list.html index 03efe303..b10a6baa 100644 --- a/layouts/partials/single/collection-list.html +++ b/layouts/partials/single/collection-list.html @@ -1,5 +1,5 @@ {{- /* Collection List */ -}} -{{- $params := .Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} {{- if .Params.collections | and $params.collectionList | and (not $params.password) -}} {{- $collectionTerms := .GetTerms "collections" -}} diff --git a/layouts/partials/single/collection-nav.html b/layouts/partials/single/collection-nav.html index 94c0c34a..97e3a7eb 100644 --- a/layouts/partials/single/collection-nav.html +++ b/layouts/partials/single/collection-nav.html @@ -1,5 +1,5 @@ {{- /* Collection Navigation */ -}} -{{- $params := .Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} {{- if .Params.collections | and $params.collectionNavigation | and (not $params.password) -}} {{- $collectionTerms := .GetTerms "collections" -}} diff --git a/layouts/partials/single/comment.html b/layouts/partials/single/comment.html index 9f0972e2..04626e26 100644 --- a/layouts/partials/single/comment.html +++ b/layouts/partials/single/comment.html @@ -325,7 +325,7 @@ {{- end -}}
{{- /* lightgallery for Artalk and Twikoo */ -}} - {{- $params := .Scratch.Get "params" -}} + {{- $params := partial "function/params.html" -}} {{- if not $params.lightgallery | and (($artalk.enable | and $artalk.lightgallery) | or ($twikoo.enable | and $twikoo.lightgallery)) -}} {{- $source := $cdn.lightgalleryCSS | default "lib/lightgallery/css/lightgallery-bundle.min.css" -}} {{- dict "Source" $source "Fingerprint" $fingerprint | dict "Scratch" .Scratch "Data" | partial "scratch/style.html" -}} diff --git a/layouts/partials/single/expiration-reminder.html b/layouts/partials/single/expiration-reminder.html index 306588c7..45367302 100644 --- a/layouts/partials/single/expiration-reminder.html +++ b/layouts/partials/single/expiration-reminder.html @@ -1,4 +1,4 @@ -{{- $params := .Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} {{- $expirationReminder := $params.expirationReminder | default dict -}} {{- if $expirationReminder.enable -}} diff --git a/layouts/partials/single/fixit-decryptor.html b/layouts/partials/single/fixit-decryptor.html index 1aa3a511..1f107450 100644 --- a/layouts/partials/single/fixit-decryptor.html +++ b/layouts/partials/single/fixit-decryptor.html @@ -1,7 +1,7 @@ -{{- $params := .Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} {{- if $params.password -}} - {{- $msg := (.Scratch.Get "params").message | default (T "single.encryptedMessage") -}} + {{- $msg := $params.message | default (T "single.encryptedMessage") -}} {{- $loading := resources.Get "images/loading.svg" | minify -}}
decryptor loading diff --git a/layouts/partials/single/footer.html b/layouts/partials/single/footer.html index 66bd4c52..27799387 100644 --- a/layouts/partials/single/footer.html +++ b/layouts/partials/single/footer.html @@ -1,4 +1,4 @@ -{{- $params := .Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} {{- /* Git info */ -}} {{- $gitRepo := "" -}} diff --git a/layouts/partials/single/related.html b/layouts/partials/single/related.html index 927c662e..9b6d704c 100644 --- a/layouts/partials/single/related.html +++ b/layouts/partials/single/related.html @@ -1,6 +1,6 @@ {{- /* Related Content */ -}} {{- /* https://gohugo.io/content-management/related/ */ -}} -{{- $params := .Scratch.Get "params" -}} +{{- $params := partial "function/params.html" -}} {{- if $params.related.enable | and (not $params.password) -}} {{- $posts := .Scratch.Get "mainSectionPages" -}} diff --git a/layouts/posts/single.html b/layouts/posts/single.html index d5b0bca6..2ef21968 100644 --- a/layouts/posts/single.html +++ b/layouts/posts/single.html @@ -4,7 +4,7 @@ {{- end -}} {{- define "content" -}} - {{- $params := .Scratch.Get "params" -}} + {{- $params := partial "function/params.html" -}} {{- $toc := .Scratch.Get "toc" -}} {{- $tocEmpty := eq .TableOfContents `` -}} diff --git a/layouts/shortcodes/mapbox.html b/layouts/shortcodes/mapbox.html index 3167162d..e4d68b68 100644 --- a/layouts/shortcodes/mapbox.html +++ b/layouts/shortcodes/mapbox.html @@ -1,4 +1,4 @@ -{{- $mapbox := (.Page.Scratch.Get "params").mapbox | default dict -}} +{{- $mapbox := (partial "function/params.html").mapbox | default dict -}} {{- $lng := cond .IsNamedParams (.Get "lng") (.Get 0) -}} {{- $lat := cond .IsNamedParams (.Get "lat") (.Get 1) -}}