From 0f78c4afbf74d13ee7a31bd81b3dd5f95d958664 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Sat, 12 Jul 2014 09:07:51 +0100 Subject: [PATCH] Fix problem with tabs macro changing current tiddler The problem was introduced in e18d8a88661a1c2caa1b722841747c75ca6af437 --- core/wiki/macros/tabs.tid | 6 +----- editions/tw5.com/tiddlers/ReleaseHistoryTemplate.tid | 6 +++--- editions/tw5.com/tiddlers/macros/TabsMacro.tid | 2 ++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/core/wiki/macros/tabs.tid b/core/wiki/macros/tabs.tid index 8d6d2d8fb..c7c749ed2 100644 --- a/core/wiki/macros/tabs.tid +++ b/core/wiki/macros/tabs.tid @@ -16,16 +16,12 @@ tags: $:/tags/Macro <$reveal type="match" state=<> text=<> default="$default$"> -<$tiddler tiddler=<>> - <$transclude tiddler="$template$" mode="block"> -<$transclude mode="block"/> +<$transclude tiddler=<> mode="block"/> - - diff --git a/editions/tw5.com/tiddlers/ReleaseHistoryTemplate.tid b/editions/tw5.com/tiddlers/ReleaseHistoryTemplate.tid index da4ebc11c..2f4eb2500 100644 --- a/editions/tw5.com/tiddlers/ReleaseHistoryTemplate.tid +++ b/editions/tw5.com/tiddlers/ReleaseHistoryTemplate.tid @@ -1,7 +1,7 @@ title: ReleaseHistoryTemplate -

<$link ><$view field="title"/>

+

<$link to=<>><$view tiddler=<> field="title"/>

-^^Released <$view field="released" format="date" template="DDth MMM YYYY at 0hh:0mm">TBA^^ +^^Released <$view tiddler=<> field="released" format="date" template="DDth MMM YYYY at 0hh:0mm">TBA^^ -<$transclude/> +<$transclude tiddler=<> /> diff --git a/editions/tw5.com/tiddlers/macros/TabsMacro.tid b/editions/tw5.com/tiddlers/macros/TabsMacro.tid index 47f66deb6..934fffef0 100644 --- a/editions/tw5.com/tiddlers/macros/TabsMacro.tid +++ b/editions/tw5.com/tiddlers/macros/TabsMacro.tid @@ -17,6 +17,8 @@ By default the tab control arranges the tabs horizontally with the content under |4th |class |Additional CSS classes for the three wrappers DIV of the tab | | |5th |template |Optional template through which to render the tab content | | +Within the template the title of the current tab is available in the widget variable ''currentTab''. + ! Examples Here is an example of the tabs macro: