Remove raw param

This commit is contained in:
Will Faught
2023-03-05 14:57:18 -08:00
parent a2477daa5a
commit 693fe4b088
9 changed files with 17 additions and 64 deletions

View File

@@ -12,7 +12,6 @@
{{ $method := $params.method }}
{{ $options := $params.options }}
{{ $page := $params.page }}
{{ $raw := $params.raw }}
{{ $referrerpolicy := $params.referrerpolicy | default "no-referrer" }}
{{ $resource := $params.resource }}
{{ $src := $params.src }}
@@ -27,16 +26,14 @@
{{ $intrinsicheight := $height }}
{{ $intrinsicwidth := $width }}
{{ if $raw }}
{{ $src = relLangURL $src }}
{{ else }}
{{ if not $resource }}
{{ $resource = partial "paige/resource.html" (dict
"page" $page
"url" $src
) }}
{{ end }}
{{ if not $resource }}
{{ $resource = partial "paige/resource.html" (dict
"page" $page
"url" $src
) }}
{{ end }}
{{ with $resource }}
{{ if and $method $options }}
{{ if eq $method "crop" }}
{{ $resource = $resource.Crop $options }}
@@ -59,6 +56,8 @@
{{ end }}
{{ $src = $resource.RelPermalink }}
{{ else }}
{{ $src = relLangURL $src }}
{{ end }}
{{ if and (or $height $maxheight) (not (or $maxwidth $width)) }}

View File

@@ -7,7 +7,6 @@
{{ $integrity := $params.integrity }}
{{ $outputstyle := cond hugo.IsProduction "compressed" "" }}
{{ $page := $params.page }}
{{ $raw := $params.raw }}
{{ $referrerpolicy := $params.referrerpolicy | default "no-referrer" }}
{{ $sass := $params.sass }}
@@ -15,13 +14,8 @@
{{ errorf "paige/link: no href" }}
{{ end }}
{{ if not $raw }}
{{ $resource := partial "paige/resource.html" (dict
"page" $page
"url" $href
) }}
{{ $resource = resources.ExecuteAsTemplate $href (or $page dict) $resource }}
{{ with partial "paige/resource.html" (dict "page" $page "url" $href) }}
{{ $resource := resources.ExecuteAsTemplate $href (or $page dict) . }}
{{ if $sass }}
{{ $resource = $resource | toCSS (dict
@@ -34,6 +28,8 @@
{{ $resource = $resource | minify | fingerprint }}
{{ $href = $resource.RelPermalink }}
{{ $integrity = $resource.Data.Integrity }}
{{ else }}
{{ $href = relLangURL $href }}
{{ end }}
<link {{ with $crossorigin }} crossorigin="{{ . }}" {{ end }} href="{{ $href | safeURL }}" {{ with $integrity }} integrity="{{ . }}" {{ end }} {{ with $referrerpolicy }} referrerpolicy="{{ . }}" {{ end }} rel="stylesheet">

View File

@@ -35,8 +35,4 @@
{{ end }}
{{ end }}
{{ if not $result }}
{{ errorf "paige/resource: invalid resource: %q" $url }}
{{ end }}
{{ return $result }}

View File

@@ -6,23 +6,18 @@
{{ $onload := $params.onload | safeJS }}
{{ $page := $params.page }}
{{ $referrerpolicy := $params.referrerpolicy | default "no-referrer" }}
{{ $raw := $params.raw }}
{{ $src := $params.src }}
{{ if not $src }}
{{ errorf "paige/script: no src" }}
{{ end }}
{{ if $raw }}
{{ $src = $src }}
{{ else }}
{{ $resource := (partial "paige/resource.html" (dict
"page" $page
"url" $src
)) | minify | fingerprint }}
{{ with partial "paige/resource.html" (dict "page" $page "url" $src) }}
{{ $resource := . | minify | fingerprint }}
{{ $integrity = $resource.Data.Integrity }}
{{ $src = $resource.RelPermalink }}
{{ else }}
{{ $href = relLangURL $href }}
{{ end }}
<script {{ with $crossorigin }} crossorigin="{{ . }}" {{ end }} {{ with $defer }} defer {{ end }} integrity="{{ $integrity }}" {{ with $onload }} onload="{{ . }}" {{ end }} {{ with $referrerpolicy }} referrerpolicy="{{ . }}" {{ end }} src="{{ $src | safeURL }}"></script>