From 86d7c8d001cf4c5309cf6ffe4a87752b1721cbc5 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Sun, 23 Apr 2023 20:59:21 +0200
Subject: [PATCH] Minor codestyle fixes to meta_breadcrumb. Moving safeJS to
 the partial output.

---
 layouts/partials/meta_breadcrumb_json_ld.html | 30 +++++++++----------
 layouts/partials/meta_json_ld.html            | 23 +++++++-------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/layouts/partials/meta_breadcrumb_json_ld.html b/layouts/partials/meta_breadcrumb_json_ld.html
index eee976f..2d1f5af 100644
--- a/layouts/partials/meta_breadcrumb_json_ld.html
+++ b/layouts/partials/meta_breadcrumb_json_ld.html
@@ -1,10 +1,10 @@
-{{- $breadcrumbScratch := newScratch -}}
-{{- $crumbScratch := newScratch -}}
-{{- $crumbScratch.Set "itemListElement" (slice) -}}
-{{- $breadPos := 0 -}}
-{{- range .Ancestors.Reverse -}}
-  {{- $breadPos = (add $breadPos 1) -}}
-  {{- $crumbScratch.Add "itemListElement" (dict
+{{ $breadcrumbScratch := newScratch -}}
+{{ $crumbScratch := newScratch -}}
+{{ $crumbScratch.Set "itemListElement" (slice) -}}
+{{ $breadPos := 0 -}}
+{{ range .Ancestors.Reverse -}}
+  {{ $breadPos = (add $breadPos 1) -}}
+  {{ $crumbScratch.Add "itemListElement" (dict
     "@type" "ListItem"
     "position" $breadPos
     "item" (dict
@@ -12,9 +12,9 @@
       "name" .LinkTitle
     )
   ) -}}
-{{- end -}}
-{{- $breadPos = (add $breadPos 1) -}}
-{{- $crumbScratch.Add "itemListElement" (dict
+{{ end -}}
+{{ $breadPos = (add $breadPos 1) -}}
+{{ $crumbScratch.Add "itemListElement" (dict
   "@type" "ListItem"
   "position" $breadPos
   "item" (dict
@@ -22,8 +22,8 @@
     "name" .LinkTitle
   )
 ) -}}
-{{- $breadcrumbScratch.SetInMap "breadcrumb" "@context" "https://schema.org" -}}
-{{- $breadcrumbScratch.SetInMap "breadcrumb" "@type" "BreadcrumbList" -}}
-{{- $breadcrumbScratch.SetInMap "breadcrumb" "itemListElement" ($crumbScratch.Get "itemListElement") -}}
-{{- $jsonifiedBreadcrumb := $breadcrumbScratch.Get "breadcrumb" | jsonify (dict "indent" "  " "prefix" "    ") -}}
-{{- return $jsonifiedBreadcrumb -}}
+{{ $breadcrumbScratch.SetInMap "breadcrumb" "@context" "https://schema.org" -}}
+{{ $breadcrumbScratch.SetInMap "breadcrumb" "@type" "BreadcrumbList" -}}
+{{ $breadcrumbScratch.SetInMap "breadcrumb" "itemListElement" ($crumbScratch.Get "itemListElement") -}}
+{{ $jsonifiedBreadcrumb := $breadcrumbScratch.Get "breadcrumb" | jsonify (dict "indent" "  " "prefix" "    ") -}}
+{{ return ($jsonifiedBreadcrumb | safeJS) -}}
diff --git a/layouts/partials/meta_json_ld.html b/layouts/partials/meta_json_ld.html
index 2e3d361..156004f 100644
--- a/layouts/partials/meta_json_ld.html
+++ b/layouts/partials/meta_json_ld.html
@@ -1,17 +1,14 @@
 <script type="application/ld+json">
-{{- $blogSections := site.Params.blogSections | default (slice "blog" "post") }}
-{{- $breadcrumbSections := site.Params.breadcrumbSections | default (slice) }}
+{{ $blogSections := site.Params.blogSections | default (slice "blog" "post") -}}
+{{ $breadcrumbSections := site.Params.breadcrumbSections | default (slice) -}}
   {
     "@context": "https://schema.org",
     {{ if .IsPage -}}
-    "@type": {{ if in $blogSections .Section -}}
-      "BlogPosting",
-      {{- else -}}
-      "WebPage",
-        {{- if in $breadcrumbSections .Section }}
-    "breadcrumb": {{ safeJS (partial "meta_breadcrumb_json_ld.html" .) }},
-        {{- end -}}
-      {{- end }}
+    "@type": {{ if in $blogSections .Section }}"BlogPosting",{{ else }}"WebPage",
+    {{ if in $breadcrumbSections .Section -}}
+    "breadcrumb": {{ partial "meta_breadcrumb_json_ld.html" . }},
+    {{ end -}}
+    {{ end -}}
     "headline": {{ .Title }},
     "datePublished": {{ .Date.Format "2006-01-02T15:04:05Z07:00" }},
     "dateModified": {{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }},
@@ -24,9 +21,9 @@
     {{ end -}}
     {{ else -}}
     "@type": "WebPage",
-      {{- if in $breadcrumbSections .Section }}
-    "breadcrumb": {{ safeJS (partial "meta_breadcrumb_json_ld.html" .) }},
-      {{- end }}
+    {{ if in $breadcrumbSections .Section -}}
+    "breadcrumb": {{ partial "meta_breadcrumb_json_ld.html" . }},
+    {{ end -}}
     "url" : {{ .Permalink }},
     "name": {{ .Title }},
     {{ with $.Param "description" -}}