hibby/PaperModX
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "fix wrong load stylesheet and JS on multihost (multilingual) #126"

Browse source 
Doesn't work with multilingual config with no specific baseurl

This reverts commit ad79fdaf83.
This commit is contained in:
Aditya Telange 2021-01-20 19:11:06 +05:30
parent ad79fdaf83
commit e02df37142
No known key found for this signature in database
GPG key ID: 82E844EF3DA99E77
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
layouts/partials/footer.html
View file

@ -21,11 +21,11 @@
{{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (not $isHLJSdisabled)) }}
{{- if not .Site.Params.assets.disableFingerprinting }}
{{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify | fingerprint }}
<script defer src="{{ $highlight.RelPermalink | absLangURL }}" integrity="{{ $highlight.Data.Integrity }}"
<script defer src="{{ $highlight.RelPermalink }}" integrity="{{ $highlight.Data.Integrity }}"
onload="hljs.initHighlightingOnLoad();"></script>
{{- else}}
{{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | minify }}
<script defer src="{{ $highlight.RelPermalink | absLangURL }}" onload="hljs.initHighlightingOnLoad();"></script>
<script defer src="{{ $highlight.RelPermalink }}" onload="hljs.initHighlightingOnLoad();"></script>
{{- end}}
{{- end }}
<script>

8
layouts/partials/head.html
View file

@ -29,10 +29,10 @@
{{- if not .Site.Params.assets.disableFingerprinting }}
{{- $stylesheet := $stylesheet | fingerprint -}}
<link href="{{ $stylesheet.RelPermalink | absLangURL }}" integrity="{{ $stylesheet.Data.Integrity }}" rel="preload stylesheet"
<link href="{{ $stylesheet.RelPermalink }}" integrity="{{ $stylesheet.Data.Integrity }}" rel="preload stylesheet"
as="style">
{{- else}}
<link href="{{ $stylesheet.RelPermalink | absLangURL }}" rel="preload stylesheet" as="style">
<link href="{{ $stylesheet.RelPermalink }}" rel="preload stylesheet" as="style">
{{- end}}
<!-- Search -->
{{- if (eq .Layout `search`) -}}
@ -41,10 +41,10 @@
{{- $fusejs := resources.Get "js/fuse.js" }}
{{- if not .Site.Params.assets.disableFingerprinting }}
{{- $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify | fingerprint }}
<script defer src="{{ $search.RelPermalink | absLangURL }}" onload="loadSearch();" integrity="{{ $search.Data.Integrity }}"></script>
<script defer src="{{ $search.RelPermalink }}" onload="loadSearch();" integrity="{{ $search.Data.Integrity }}"></script>
{{- else}}
{{ $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" | minify }}
<script defer src="{{ $search.RelPermalink | absLangURL }}" onload="loadSearch();"></script>
<script defer src="{{ $search.RelPermalink }}" onload="loadSearch();"></script>
{{- end}}
{{- end -}}