Replace use of add with path.Join for buildig paths.
This commit is contained in:
parent
4336c6b036
commit
56d3c30a98
4 changed files with 13 additions and 13 deletions
|
|
@ -14,7 +14,7 @@
|
|||
{{ $maxwidth := site.Params.imageMaxWidth -}}
|
||||
{{ $realwidth := 0 -}}
|
||||
{{ $realheight := 0 -}}
|
||||
{{ if and $src (fileExists (add "/assets" $src)) -}}
|
||||
{{ if and $src (fileExists (path.Join "/assets" $src)) -}}
|
||||
{{ $original := resources.Get $src -}}
|
||||
{{ if $size -}}
|
||||
{{ $image := $original.Resize $size -}}
|
||||
|
|
@ -34,8 +34,8 @@
|
|||
{{ $width = "" -}}
|
||||
{{ $height = "" -}}
|
||||
{{ end -}}
|
||||
{{ else if and $src (fileExists (add "/static" $src)) -}}
|
||||
{{ with (imageConfig (add "/static" $src)) -}}
|
||||
{{ else if and $src (fileExists (path.Join "/static" $src)) -}}
|
||||
{{ with (imageConfig (path.Join "/static" $src)) -}}
|
||||
{{ $realwidth = .Width -}}
|
||||
{{ $realheight = .Height -}}
|
||||
{{ end -}}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
{{ $newtab := .Get "newtab" | default false -}}
|
||||
{{ $src := .Get "src" -}}
|
||||
{{ $text := .Get "text" -}}
|
||||
{{ if and $src (fileExists (add "/assets" $src)) -}}
|
||||
{{ if and $src (fileExists (path.Join "/assets" $src)) -}}
|
||||
{{ $original := resources.Get $src -}}
|
||||
{{ $src = $original.RelPermalink -}}
|
||||
{{ end -}}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
{{ $maxwidth := site.Params.imageMaxWidth -}}
|
||||
{{ $realwidth := 0 -}}
|
||||
{{ $realheight := 0 -}}
|
||||
{{ if and $src (fileExists (add "/assets" $src)) -}}
|
||||
{{ if and $src (fileExists (path.Join "/assets" $src)) -}}
|
||||
{{ $original := resources.Get $src -}}
|
||||
{{ if $size -}}
|
||||
{{ $image := $original.Resize $size -}}
|
||||
|
|
@ -30,8 +30,8 @@
|
|||
{{ $width = "" -}}
|
||||
{{ $height = "" -}}
|
||||
{{ end -}}
|
||||
{{ else if and $src (fileExists (add "/static" $src)) -}}
|
||||
{{ with (imageConfig (add "/static" $src)) -}}
|
||||
{{ else if and $src (fileExists (path.Join "/static" $src)) -}}
|
||||
{{ with (imageConfig (path.Join "/static" $src)) -}}
|
||||
{{ $realwidth = .Width -}}
|
||||
{{ $realheight = .Height -}}
|
||||
{{ end -}}
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@
|
|||
{{ $link := .Get "link" -}}
|
||||
{{ $src := .Get "src" -}}
|
||||
{{ $width := .Get "width" -}}
|
||||
{{ if and $src (fileExists (add "/assets" $src)) -}}
|
||||
{{ if and $src (fileExists (path.Join "/assets" $src)) -}}
|
||||
{{ $original := resources.Get $src -}}
|
||||
{{ if $inline -}}
|
||||
{{ $src = $original.Content -}}
|
||||
{{ else -}}
|
||||
{{ $src = $original.RelPermalink -}}
|
||||
{{ end -}}
|
||||
{{ else if and $src $inline (fileExists (add "/static" $src)) -}}
|
||||
{{ $src = readFile (add "/static" $src) -}}
|
||||
{{ else if and $src $inline (fileExists (path.Join "/static" $src)) -}}
|
||||
{{ $src = readFile (path.Join "/static" $src) -}}
|
||||
{{ end -}}
|
||||
{{ if and $width $height -}}
|
||||
{{ $width = int $width -}}
|
||||
|
|
|
|||
Loading…
Reference in a new issue