Skip to content

Commit 897d0df

Browse files
authored
Merge pull request #48561 from sftim/20241027_docsy_friendly_banner_dismissal
Ready announcements for Docsy
2 parents 02f6e65 + d38b7b4 commit 897d0df

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed
File renamed without changes.

layouts/partials/head.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<script src="https://unpkg.com/[email protected]/lunr.js"></script>
3434
<script src="/js/offline-search.js"></script>
3535
{{end}}
36-
{{ partial "hooks/head-end.html" . }}
3736

3837
<!-- Docsy head.html ends here -->
3938

@@ -78,11 +77,11 @@
7877
<!--script src="https://unpkg.com/split.js/dist/split.min.js"></script-->
7978
<script src="/js/split-1.6.0.js" intregrity="sha384-0blL3GqHy6+9fw0cyY2Aoiwg4onHAtslAs4OkqZY7UQBrR65/K4gI+hxLdWDrjpz"></script>
8079

81-
<!--Script for dismissing banners/notices-->
82-
<script defer src="{{ "js/dismiss_banner.js" | relURL }}"></script>
83-
8480
{{- if eq (lower .Params.cid) "community" -}}
8581
<script defer src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
8682
{{- end -}}
8783
{{ with .Params.js }}{{ range (split . ",") }}<script src="{{ (trim . " ") | relURL }}"></script><!-- custom js added -->
8884
{{ end }}{{ else }}<!-- no custom js detected -->{{ end }}
85+
86+
{{/* make sure that head-end hook comes last */}}
87+
{{ partial "hooks/head-end.html" . }}

layouts/partials/hooks/head-end.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,12 @@
5252
<script defer src="{{ $releaseBinariesJs.RelPermalink }}"></script>
5353
{{- end -}}
5454
{{- end -}}
55+
56+
{{/* JavaScript for announcements */}}
57+
{{- if hugo.IsProduction -}}
58+
{{- $bannerDismissJs := resources.Get "js/banner-dismiss.js" | minify | fingerprint -}}
59+
<script defer src="{{ $bannerDismissJs.RelPermalink }}" integrity="{{ $bannerDismissJs.Data.Integrity }}" crossorigin="anonymous"></script>
60+
{{- else -}}
61+
{{- $bannerDismissJs := resources.Get "js/banner-dismiss.js" -}}
62+
<script defer src="{{ $bannerDismissJs.RelPermalink }}"></script>
63+
{{- end -}}

0 commit comments

Comments
 (0)