From b2c5f2b8cabb6b20a426d2e9c1d5ae7157a3c354 Mon Sep 17 00:00:00 2001
From: tdro <tdro@noreply.example.com>
Date: Tue, 7 Nov 2023 07:21:18 -0500
Subject: themes/default/layouts/_default/_markup/render-image: Guard cases

To satisfy the validator and fix last deployment
---
 themes/default/layouts/_default/_markup/render-image.html |  2 +-
 themes/default/layouts/partials/gallery-walk.html         | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'themes/default/layouts')

diff --git a/themes/default/layouts/_default/_markup/render-image.html b/themes/default/layouts/_default/_markup/render-image.html
index 97dbbbb..04bf931 100644
--- a/themes/default/layouts/_default/_markup/render-image.html
+++ b/themes/default/layouts/_default/_markup/render-image.html
@@ -86,7 +86,7 @@
   <a data-orientation="{{ $orientation }}" href="{{ $source }}">
     <picture>
       {{- with $srcset }}
-      <source srcset="{{ $srcset }}" type="{{ $type }}" />
+      <source srcset="{{ $srcset }}" type="{{ or $type "image/webp" }}" />
       {{- end }}
       <img
         loading="lazy"
diff --git a/themes/default/layouts/partials/gallery-walk.html b/themes/default/layouts/partials/gallery-walk.html
index 693c113..ca95d3f 100644
--- a/themes/default/layouts/partials/gallery-walk.html
+++ b/themes/default/layouts/partials/gallery-walk.html
@@ -26,16 +26,20 @@
   {{- range $image := $data }}
   <a href="{{ $image.relatedHref }}">
     <picture>
-      <source
-        {{ $image.srcset | safeHTMLAttr }}
-        {{ $image.type   | safeHTMLAttr }}
-      />
+      {{- with $image.srcset -}}
+        <source
+          {{ $image.srcset | safeHTMLAttr }}
+          {{ $image.type   | safeHTMLAttr }}
+        />
+      {{- end -}}
       <img
        loading="lazy"
         {{ $image.alt    | safeHTMLAttr }}
         {{ $image.title  | safeHTMLAttr }}
+        {{ with ne (index (last 1 (split $image.width "=")) 0) `""` }}
         {{ $image.width  | safeHTMLAttr }}
         {{ $image.height | safeHTMLAttr }}
+        {{ end }}
         {{ $image.src    | safeHTMLAttr }}
         {{ $image.style  | safeHTMLAttr }}
       />
-- 
cgit v1.2.3