fix: $media_dir edge case for shortcode instance within widget

This commit is contained in:
George Cushen committed 2020-08-24 13:21:29 +01:00
1 parent aa22bcefd8
commit c0f0326de7
4 files changed
+4 -4

No files matched your search

+1 -1
View File
@@ -3,7 +3,7 @@
{{ $path := "" }}
{{ $root_dir := "" }}
{{ $media_dir := .Page.Scratch.Get "media_dir" }}
{{ $media_dir := site.Params.media_dir | default "media" }}
{{ if .Get "library" }}
{{ $path = printf "%s/" $media_dir }}
{{ $root_dir = "static/" }}
+1 -1
View File
@@ -1,6 +1,6 @@
{{/* Enable image to be loaded from local page dir or media library at `static/media/`. */}}
{{ $media_dir := .Page.Scratch.Get "media_dir" }}
{{ $media_dir := site.Params.media_dir | default "media" }}
{{ $asset := (.Page.Resources.ByType "image").GetMatch (.Get "src") }}
{{ $is_svg := false }}
{{ if $asset }}
+1 -1
View File
@@ -42,7 +42,7 @@
{{ $.Scratch.Set "src" .image }}
{{ if gt (len .image) 4 }}
{{ if ne "http" (slicestr .image 0 4) }}
{{ $media_dir := .Page.Scratch.Get "media_dir" }}
{{ $media_dir := site.Params.media_dir | default "media" }}
{{ $.Scratch.Set "src" (printf "%s/%s" $media_dir .image | relURL) }}
{{ end }}
{{ end }}
+1 -1
View File
@@ -2,7 +2,7 @@
{{ $path := "" }}
{{ $root_dir := "" }}
{{ $media_dir := .Page.Scratch.Get "media_dir" }}
{{ $media_dir := site.Params.media_dir | default "media" }}
{{ if .Get "library" }}
{{ $path = printf "%s/" $media_dir }}
{{ $root_dir = "static/" }}