From 9a0dba5ee4ab1ec2d0e1b380676434c51f7a80cb Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 27 Apr 2023 11:44:25 +0200 Subject: [PATCH] Fix loading tag manager script twice --- layouts/_default/baseof.html | 4 ++-- layouts/partials/footer/scripts.html | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 8ae92cf0..c07ffd43 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -10,7 +10,7 @@ {{- if site.Params.main.enableDarkMode -}} - {{- partial "footer/scripts.html" (dict "filename" "js/critical.bundle.js" "match" "js/critical/**.js" "page" .) -}} + {{- partial "footer/scripts.html" (dict "filename" "js/critical.bundle.js" "match" "js/critical/**.js" "header" true "page" .) -}} {{- end -}}
@@ -57,6 +57,6 @@ {{- partial "footer/footer.html" . -}} {{ end -}} - {{- partialCached "footer/scripts.html" (dict "page" .) }} + {{- partialCached "footer/scripts.html" (dict "header" false "page" .) }} diff --git a/layouts/partials/footer/scripts.html b/layouts/partials/footer/scripts.html index 68aa4969..0b4adb18 100644 --- a/layouts/partials/footer/scripts.html +++ b/layouts/partials/footer/scripts.html @@ -1,6 +1,7 @@ {{ $filename := .filename | default "js/main.bundle.js" -}} {{ $match := .match | default "{js/*.js,js/vendor/**.js}" }} {{ $page := .page }} +{{ $header := .header }} {{ $files := slice -}} {{ range $index, $file := resources.Match $match -}} @@ -11,7 +12,7 @@ {{ $bundle := $files | resources.Concat $filename -}} {{ $js := $bundle | resources.ExecuteAsTemplate $filename $page -}} - {{- if (not site.IsServer) -}} + {{- if and (not site.IsServer) $header -}} {{- $pc := site.Config.Privacy.GoogleAnalytics -}} {{- if and (not $pc.Disable) (hasPrefix site.GoogleAnalytics "G-") }}