nishiki/hugo-theme-relearn
1
0
Fork 0
mirror of https://github.com/McShelby/hugo-theme-relearn.git synced 2024-11-23 07:47:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

highlight: handle string options in funnel file #169

Browse source 
as it may happen to be called with string options in case of documented `partial (compat)` mode
This commit is contained in:
Sören Weber 2023-06-22 17:34:04 +02:00
parent 047606ff45
commit 7e073f9681
No known key found for this signature in database
GPG key ID: BEC6D55545451B6D
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
layouts/partials/shortcodes/highlight.html
View file

@ -12,7 +12,14 @@
{{- else if eq $k "content" }} {{- else if eq $k "content" }}
{{- $content = trim $v "\n\r" }} {{- $content = trim $v "\n\r" }}
{{- else if eq $k "options" }} {{- else if eq $k "options" }}
{{- $options = $v }} {{- if eq (printf "%T" $v) "string" }}
{{- range (split $v ",") }}
{{- $pair := split . "=" }}
{{- $options = $options | merge (dict (index $pair 0) (index $pair 1)) }}
{{- end }}
{{- else }}
{{- $options = $v }}
{{- end }}
{{- else if eq $k "type" }} {{- else if eq $k "type" }}
{{- $type = $v }} {{- $type = $v }}
{{- else if eq $k "wrap" }} {{- else if eq $k "wrap" }}
@ -27,7 +34,7 @@
{{- if eq $k "wrap" }} {{- if eq $k "wrap" }}
{{- $otherAttributes = (dict $k $v) | merge $otherAttributes }} {{- $otherAttributes = (dict $k $v) | merge $otherAttributes }}
{{- else }} {{- else }}
{{- $otherOptions = $otherOptions | merge (dict $k $v) }} {{- $otherOptions = (dict $k $v) | merge $otherOptions }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- $options = $otherOptions }} {{- $options = $otherOptions }}

11
layouts/shortcodes/highlight.html
View file

@ -9,27 +9,20 @@
{{- end }} {{- end }}
{{- $attributes := dict }} {{- $attributes := dict }}
{{- $options := dict }} {{- $options := dict }}
{{- $stringOptions := "" }}
{{- $otherOptions := dict }}
{{- $type := "" }} {{- $type := "" }}
{{- range $k, $v := .Params }} {{- range $k, $v := .Params }}
{{- if eq $k 0 }} {{- if eq $k 0 }}
{{- $type = $v }} {{- $type = $v }}
{{- else if eq $k 1 }} {{- else if eq $k 1 }}
{{- $stringOptions = trim $v "\n\r\t " }} {{- $options = $v }}
{{- else if eq $k "type" }} {{- else if eq $k "type" }}
{{- $type = $v }} {{- $type = $v }}
{{- else if eq $k "wrap" }} {{- else if eq $k "wrap" }}
{{- $attributes = $attributes | merge (dict $k $v) }} {{- $attributes = $attributes | merge (dict $k $v) }}
{{- else }} {{- else }}
{{- $otherOptions = $otherOptions | merge (dict $k $v) }} {{- $options = $options | merge (dict $k $v) }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- range (split $stringOptions ",") }}
{{- $pair := split . "=" }}
{{- $options = $options | merge (dict (index $pair 0) (index $pair 1)) }}
{{- end }}
{{- $options = $options | merge $otherOptions }}
{{- partial "shortcodes/highlight.html" (dict {{- partial "shortcodes/highlight.html" (dict
"context" .Page "context" .Page
"attributes" $attributes "attributes" $attributes