diff --git a/assets/js/shortcodes/tabs.js b/assets/js/shortcodes/tabs.js index 121c1c6c..a08c4601 100644 --- a/assets/js/shortcodes/tabs.js +++ b/assets/js/shortcodes/tabs.js @@ -34,8 +34,8 @@ function activateTab(container, activeIndex) { }); } -if (document.readyState === 'loading') { - document.addEventListener('DOMContentLoaded', initTabs); +if (document.readyState === "loading") { + document.addEventListener("DOMContentLoaded", initTabs); } else { initTabs(); } diff --git a/exampleSite/content/docs/shortcodes/index.it.md b/exampleSite/content/docs/shortcodes/index.it.md index 8ab3f6b2..aa78e0ef 100644 --- a/exampleSite/content/docs/shortcodes/index.it.md +++ b/exampleSite/content/docs/shortcodes/index.it.md @@ -721,74 +721,62 @@ The `tabs` shortcode is commonly used to present different variants of a particu **Example** `````md -{{}} +{{}} -{{}} + {{}} + Install using Chocolatey: -Install using Chocolatey: + ```pwsh + choco install vscode.install + ``` -```pwsh -choco install vscode.install -``` + or install using WinGet -or install using WinGet + ```pwsh + winget install -e --id Microsoft.VisualStudioCode + ``` + {{}} -```pwsh -winget install -e --id Microsoft.VisualStudioCode -``` + {{}} + ```bash + brew install --cask visual-studio-code + ``` + {{}} -{{}} - -{{}} - -```bash -brew install --cask visual-studio-code -``` - -{{}} - -{{}} - -See [documentation](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux). - -{{}} + {{}} + See [documentation](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux). + {{}} {{}} ````` **Output** -{{< tabs labels="Windows;;macOS;;Linux" >}} +{{< tabs >}} -{{< tab >}} + {{< tab label="Windows" >}} + Install using Chocolatey: -Install using Chocolatey: + ```pwsh + choco install vscode.install + ``` -```pwsh -choco install vscode.install -``` + or install using WinGet -or install using WinGet + ```pwsh + winget install -e --id Microsoft.VisualStudioCode + ``` + {{< /tab >}} -```pwsh -winget install -e --id Microsoft.VisualStudioCode -``` + {{< tab label="macOS" >}} + ```bash + brew install --cask visual-studio-code + ``` + {{< /tab >}} -{{< /tab >}} - -{{< tab >}} - -```bash -brew install --cask visual-studio-code -``` - -{{< /tab >}} - -{{< tab >}} - -See [documentation](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux). - -{{< /tab >}} + {{< tab label="Linux" >}} + See [documentation](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux). + {{< /tab >}} {{< /tabs >}} diff --git a/exampleSite/content/docs/shortcodes/index.ja.md b/exampleSite/content/docs/shortcodes/index.ja.md index a38e24df..95e3ff0f 100644 --- a/exampleSite/content/docs/shortcodes/index.ja.md +++ b/exampleSite/content/docs/shortcodes/index.ja.md @@ -718,74 +718,62 @@ B-->C[利益] **例** ````md -{{}} +{{}} -{{}} + {{}} + Chocolatey を使用してインストール: -Chocolatey を使用してインストール: + ```pwsh + choco install vscode.install + ``` -```pwsh -choco install vscode.install -``` + または WinGet を使用してインストール -または WinGet を使用してインストール + ```pwsh + winget install -e --id Microsoft.VisualStudioCode + ``` + {{}} -```pwsh -winget install -e --id Microsoft.VisualStudioCode -``` + {{}} + ```bash + brew install --cask visual-studio-code + ``` + {{}} -{{}} - -{{}} - -```bash -brew install --cask visual-studio-code -``` - -{{}} - -{{}} - -[ドキュメント](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux)を参照。 - -{{}} + {{}} + [ドキュメント](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux)を参照。 + {{}} {{}} ```` **出力** -{{< tabs labels="Windows;;macOS;;Linux" >}} +{{< tabs >}} -{{< tab >}} + {{< tab label="Windows" >}} + Chocolatey を使用してインストール: -Chocolatey を使用してインストール: + ```pwsh + choco install vscode.install + ``` -```pwsh -choco install vscode.install -``` + または WinGet を使用してインストール -または WinGet を使用してインストール + ```pwsh + winget install -e --id Microsoft.VisualStudioCode + ``` + {{< /tab >}} -```pwsh -winget install -e --id Microsoft.VisualStudioCode -``` + {{< tab label="macOS" >}} + ```bash + brew install --cask visual-studio-codeqweqwe + ``` + {{< /tab >}} -{{< /tab >}} - -{{< tab >}} - -```bash -brew install --cask visual-studio-code -``` - -{{< /tab >}} - -{{< tab >}} - -[ドキュメント](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux)を参照。 - -{{< /tab >}} + {{< tab label="Linux" >}} + [ドキュメント](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux)を参照。 + {{< /tab >}} {{< /tabs >}} diff --git a/exampleSite/content/docs/shortcodes/index.md b/exampleSite/content/docs/shortcodes/index.md index a1add5f7..c1e36f42 100644 --- a/exampleSite/content/docs/shortcodes/index.md +++ b/exampleSite/content/docs/shortcodes/index.md @@ -727,74 +727,62 @@ The `tabs` shortcode is commonly used to present different variants of a particu **Example** `````md -{{}} +{{}} -{{}} + {{}} + Install using Chocolatey: -Install using Chocolatey: + ```pwsh + choco install vscode.install + ``` -```pwsh -choco install vscode.install -``` + or install using WinGet -or install using WinGet + ```pwsh + winget install -e --id Microsoft.VisualStudioCode + ``` + {{}} -```pwsh -winget install -e --id Microsoft.VisualStudioCode -``` + {{}} + ```bash + brew install --cask visual-studio-code + ``` + {{}} -{{}} - -{{}} - -```bash -brew install --cask visual-studio-code -``` - -{{}} - -{{}} - -See [documentation](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux). - -{{}} + {{}} + See [documentation](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux). + {{}} {{}} ````` **Output** -{{< tabs labels="Windows;;macOS;;Linux" >}} +{{< tabs >}} -{{< tab >}} + {{< tab label="Windows" >}} + Install using Chocolatey: -Install using Chocolatey: + ```pwsh + choco install vscode.install + ``` -```pwsh -choco install vscode.install -``` + or install using WinGet -or install using WinGet + ```pwsh + winget install -e --id Microsoft.VisualStudioCode + ``` + {{< /tab >}} -```pwsh -winget install -e --id Microsoft.VisualStudioCode -``` + {{< tab label="macOS" >}} + ```bash + brew install --cask visual-studio-code + ``` + {{< /tab >}} -{{< /tab >}} - -{{< tab >}} - -```bash -brew install --cask visual-studio-code -``` - -{{< /tab >}} - -{{< tab >}} - -See [documentation](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux). - -{{< /tab >}} + {{< tab label="Linux" >}} + See [documentation](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux). + {{< /tab >}} {{< /tabs >}} diff --git a/exampleSite/content/docs/shortcodes/index.zh-cn.md b/exampleSite/content/docs/shortcodes/index.zh-cn.md index b5eb1548..f1df003d 100644 --- a/exampleSite/content/docs/shortcodes/index.zh-cn.md +++ b/exampleSite/content/docs/shortcodes/index.zh-cn.md @@ -731,74 +731,62 @@ B-->C[Profit] **示例** ````md -{{}} +{{}} -{{}} + {{}} + 使用 Chocolatey 安装: -使用 Chocolatey 安装: + ```pwsh + choco install vscode.install + ``` -```pwsh -choco install vscode.install -``` + 或使用 WinGet 安装 -或使用 WinGet 安装 + ```pwsh + winget install -e --id Microsoft.VisualStudioCode + ``` + {{}} -```pwsh -winget install -e --id Microsoft.VisualStudioCode -``` + {{}} + ```bash + brew install --cask visual-studio-code + ``` + {{}} -{{}} - -{{}} - -```bash -brew install --cask visual-studio-code -``` - -{{}} - -{{}} - -参见[文档](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux)。 - -{{}} + {{}} + 参见[文档](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux)。 + {{}} {{}} ```` **输出** -{{< tabs labels="Windows;;macOS;;Linux" >}} +{{< tabs >}} -{{< tab >}} + {{< tab label="Windows" >}} + 使用 Chocolatey 安装: -使用 Chocolatey 安装: + ```pwsh + choco install vscode.install + ``` -```pwsh -choco install vscode.install -``` + 或使用 WinGet 安装 -或使用 WinGet 安装 + ```pwsh + winget install -e --id Microsoft.VisualStudioCode + ``` + {{< /tab >}} -```pwsh -winget install -e --id Microsoft.VisualStudioCode -``` + {{< tab label="macOS" >}} + ```bash + brew install --cask visual-studio-code + ``` + {{< /tab >}} -{{< /tab >}} - -{{< tab >}} - -```bash -brew install --cask visual-studio-code -``` - -{{< /tab >}} - -{{< tab >}} - -参见[文档](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux)。 - -{{< /tab >}} + {{< tab label="Linux" >}} + 参见[文档](https://code.visualstudio.com/docs/setup/linux#_install-vs-code-on-linux)。 + {{< /tab >}} {{< /tabs >}} diff --git a/layouts/shortcodes/tab.html b/layouts/shortcodes/tab.html index 05061c0c..338ccc52 100644 --- a/layouts/shortcodes/tab.html +++ b/layouts/shortcodes/tab.html @@ -1,5 +1,7 @@ -{{- $index := .Parent.Scratch.Get "tab-index" | default 0 -}} -{{- .Parent.Scratch.Set "tab-index" (add 1 $index) -}} -
- {{ .InnerDeindent | strings.TrimSpace | .Page.RenderString }} -
+{{- $label := .Get "label" -}} +{{- $index := .Parent.Store.Get "tab-index" | default 0 -}} +{{- $content := .InnerDeindent | strings.TrimSpace | .Page.RenderString -}} + +{{- $tabs := .Parent.Store.Get "tabs" | default slice -}} +{{- .Parent.Store.Set "tabs" ($tabs | append (dict "label" $label "content" $content)) -}} +{{- .Parent.Store.Set "tab-index" (add 1 $index) -}} diff --git a/layouts/shortcodes/tabs.html b/layouts/shortcodes/tabs.html index a5288500..07fe2695 100644 --- a/layouts/shortcodes/tabs.html +++ b/layouts/shortcodes/tabs.html @@ -1,23 +1,28 @@ -{{- $labels := split (.Get "labels") ";;" -}} +{{- .Store.Set "tab-index" 0 -}} +{{- $noop := .Inner -}}
- {{- range $index, $label := $labels -}} + {{- range $nTabs, $_ := .Store.Get "tabs" -}} {{- end -}}
- {{ .Inner }} + {{- range $nTabs, $_ := .Store.Get "tabs" -}} +
+ {{ index . "content" }} +
+ {{- end -}}