From 48afe4faa50944b8d6847b1627e3c20f23948c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <76261501+zecakeh@users.noreply.github.com> Date: Mon, 14 Oct 2024 19:00:49 +0200 Subject: [PATCH] Remove `withVersioning` parameter of `rver-fragment` shortcode. (#1971) --- .../internal/newsfragments/1971.clarification | 1 + content/rooms/v11.md | 2 +- layouts/shortcodes/rver-fragment.html | 23 +++++-------------- 3 files changed, 8 insertions(+), 18 deletions(-) create mode 100644 changelogs/internal/newsfragments/1971.clarification diff --git a/changelogs/internal/newsfragments/1971.clarification b/changelogs/internal/newsfragments/1971.clarification new file mode 100644 index 00000000..6c61b653 --- /dev/null +++ b/changelogs/internal/newsfragments/1971.clarification @@ -0,0 +1 @@ +Remove `withVersioning` parameter of `rver-fragment` shortcode. diff --git a/content/rooms/v11.md b/content/rooms/v11.md index 5821eb06..887b17ef 100644 --- a/content/rooms/v11.md +++ b/content/rooms/v11.md @@ -21,7 +21,7 @@ event keeps the `redacts` property under `content`. The The full redaction algorithm follows. -{{% rver-fragment name="v11-redactions" withVersioning="true" %}} +{{% rver-fragment name="v11-redactions" %}} ### Event format diff --git a/layouts/shortcodes/rver-fragment.html b/layouts/shortcodes/rver-fragment.html index 894e6f0b..c0d83e4d 100644 --- a/layouts/shortcodes/rver-fragment.html +++ b/layouts/shortcodes/rver-fragment.html @@ -7,23 +7,12 @@ The `name` parameter is the file name without extension. - The `withVersioning` parameter is optional and defaults to false. When true, any - mentions of "New in this version" from the `added-in` shortcode are removed prior - to rendering. This is useful if needing to use a fragment where part of it describes - new functionality in a given room version but isn't new for subsequent versions. - */}} -{{ $name := .Params.name }} -{{ $withVersioning := .Params.withVersioning }} +{{ $name := .Params.name -}} -{{ with .Site.GetPage "rooms/fragments" }} - {{ with .Resources.GetMatch (printf "%s%s" $name ".md") }} - {{ $content := .RenderShortcodes }} - {{ if not $withVersioning }} - {{ $content = (replace $content "[New in this version]" "") }} - {{ $content = (replace $content "[Changed in this version]" "") }} - {{ end }} -{{ $content | safeHTML }} - {{ end }} -{{ end }} +{{ with .Site.GetPage "rooms/fragments" -}} + {{ with .Resources.GetMatch (printf "%s.md" $name) -}} + {{ .RenderShortcodes | safeHTML }} + {{ end -}} +{{ end -}}