Remove page param from resource.html

layouts/partials/paige/image.html

@@ -60,7 +60,7 @@
 {{ $style = delimit $style "; " }}
 
 {{ if and (not $resource) $src }}
-    {{ $resource = partial "paige/resource.html" (dict "page" page "url" $src) }}
+    {{ $resource = partial "paige/resource.html" $src }}
 {{ end }}
 
 {{ if $resource }}

layouts/partials/paige/link.html

@@ -4,7 +4,6 @@
 {{ $href := $params.href }}
 {{ $includepaths := $params.includepaths }}
 {{ $integrity := $params.integrity }}
-{{ $page := $params.page }}
 {{ $referrerpolicy := $params.referrerpolicy | default "no-referrer" }}
 {{ $sass := $params.sass }}
 {{ $template := $params.template }}
@@ -16,11 +15,11 @@
     {{ errorf "paige/link: no href" }}
 {{ end }}
 
-{{ with partial "paige/resource.html" (dict "page" $page "url" $href) }}
+{{ with partial "paige/resource.html" $href }}
     {{ $resource := . }}
 
     {{ if $template }}
-        {{ $context := dict "color" ($page.Param "paige.color" | default "#0d6efd") }}
+        {{ $context := dict "color" (page.Param "paige.color" | default "#0d6efd") }}
         {{ $split := path.Split $href }}
         {{ $join := path.Join $split.Dir (print (printf "%#v" $context | sha1) "-" $split.File) }}
         {{ $resource = resources.ExecuteAsTemplate $join $context . }}

layouts/partials/paige/resource.html

@@ -1,7 +1,4 @@
-{{ $params := . }}
-
-{{ $page := $params.page }}
-{{ $url := $params.url }}
+{{ $url := . }}
 
 {{ $result := "" }}
 
@@ -15,11 +12,11 @@
     {{ end }}
 {{ end }}
 
-{{ if and (not $result) $page }}
-    {{ with $page.Resources.GetMatch $url }}
+{{ if and (not $result) page }}
+    {{ with page.Resources.GetMatch $url }}
         {{ $result = . }}
     {{ else }}
-        {{ with $page.Resources.Get $url }}
+        {{ with page.Resources.Get $url }}
             {{ $result = . }}
         {{ end }}
     {{ end }}

layouts/partials/paige/script.html

@@ -4,7 +4,6 @@
 {{ $defer := $params.defer | default "defer" }}
 {{ $integrity := $params.integrity }}
 {{ $onload := $params.onload | safeJS }}
-{{ $page := $params.page }}
 {{ $referrerpolicy := $params.referrerpolicy | default "no-referrer" }}
 {{ $src := $params.src }}
 {{ $type := $params.type }}
@@ -13,7 +12,7 @@
     {{ errorf "paige/script: no src" }}
 {{ end }}
 
-{{ with partial "paige/resource.html" (dict "page" $page "url" $src) }}
+{{ with partial "paige/resource.html" $src }}
     {{ $resource := . | minify | fingerprint }}
     {{ $integrity = $resource.Data.Integrity }}
     {{ $src = $resource.RelPermalink }}