move tf.tabs-getExplicitState into the tabs.tid tiddler

TiddlyWiki · Sep 9, 2024 · 4577213 · 4577213
1 parent 033b291
commit 4577213
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 20 deletions.
diff --git a/core/language/en-GB/Fields.multids b/core/language/en-GB/Fields.multids
@@ -16,7 +16,7 @@ dependents: For a plugin, lists the dependent plugin titles
 description: The descriptive text for a plugin, or a modal dialogue
 draft.of: For draft tiddlers, contains the title of the tiddler of which this is a draft
 draft.title: For draft tiddlers, contains the proposed new title of the tiddler
-explicitState: Used in tiddlers that contain the tabs-macro with a `<<tf.getExplicitState>>` parameter
+explicitState: Used in tiddlers that contain the tabs-macro with a `<<tf.tabs-getExplicitState>>` parameter
 footer: The footer text for a modal
 hide-body: The view template will hide bodies of tiddlers if set to ''yes''
 icon: The title of the tiddler containing the icon associated with a tiddler

diff --git a/core/ui/AdvancedSearch.tid b/core/ui/AdvancedSearch.tid
@@ -9,6 +9,6 @@ explicitState: $:/state/tab--1498284803
 		tabsList="[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch]!has[draft.of]]"
 		default="$:/core/ui/AdvancedSearch/System"
 		actions="""<$action-setfield $tiddler="$:/state/advancedsearch/currentTab" text=<<currentTab>>/>"""
-		explicitState=<<tf.getExplicitState>>
+		explicitState=<<tf.tabs-getExplicitState>>
 	/>
 </div>
diff --git a/core/ui/ControlPanel.tid b/core/ui/ControlPanel.tid
@@ -8,6 +8,6 @@ explicitState: $:/state/tab-1749438307
 	<$macrocall $name="tabs"
 		tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel]!has[draft.of]]"
 		default="$:/core/ui/ControlPanel/Info"
-		explicitState=<<tf.getExplicitState>>
+		explicitState=<<tf.tabs-getExplicitState>>
 	/>
 </div>
diff --git a/core/ui/ControlPanel/Advanced.tid b/core/ui/ControlPanel/Advanced.tid
@@ -10,6 +10,6 @@ explicitState: $:/state/tab--959111941
 	<$macrocall $name="tabs"
 		tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Advanced]!has[draft.of]]"
 		default="$:/core/ui/ControlPanel/TiddlerFields"
-		explicitState=<<tf.getExplicitState>>
+		explicitState=<<tf.tabs-getExplicitState>>
 	/>
 </div>
diff --git a/core/ui/ControlPanel/Appearance.tid b/core/ui/ControlPanel/Appearance.tid
@@ -10,6 +10,6 @@ explicitState: $:/state/tab--1963855381
 	<$macrocall $name="tabs"
 		tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance]!has[draft.of]]"
 		default="$:/core/ui/ControlPanel/Theme"
-		explicitState=<<tf.getExplicitState>>
+		explicitState=<<tf.tabs-getExplicitState>>
 	/>
 </div>
diff --git a/core/ui/ControlPanel/Cascades.tid b/core/ui/ControlPanel/Cascades.tid
@@ -10,6 +10,6 @@ explicitState: $:/state/tab-99014043
 	<$macrocall $name="tabs"
 		tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Cascades]!has[draft.of]]"
 		default="$:/core/ui/ControlPanel/StoryTiddler"
-		explicitState=<<tf.getExplicitState>>
+		explicitState=<<tf.tabs-getExplicitState>>
 	/>
 </div>
diff --git a/core/ui/ControlPanel/Info.tid b/core/ui/ControlPanel/Info.tid
@@ -10,6 +10,6 @@ explicitState: $:/state/tab--2112689675
 	<$macrocall $name="tabs"
 		tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Info]!has[draft.of]]"
 		default="$:/core/ui/ControlPanel/Basics"
-		explicitState=<<tf.getExplicitState>>
+		explicitState=<<tf.tabs-getExplicitState>>
 	/>
 </div>
diff --git a/core/ui/ControlPanel/Plugins.tid b/core/ui/ControlPanel/Plugins.tid
@@ -21,5 +21,5 @@ explicitState: $:/state/tab--86143343
 <$macrocall $name="tabs"
 	tabsList="[all[tiddlers+shadows]tag[$:/tags/ControlPanel/Plugins]!has[draft.of]]"
 	default="$:/core/ui/ControlPanel/Plugins/Installed/Plugins"
-	explicitState=<<tf.getExplicitState>>
+	explicitState=<<tf.tabs-getExplicitState>>
 />
diff --git a/core/ui/ControlPanel/Saving.tid b/core/ui/ControlPanel/Saving.tid
@@ -10,6 +10,6 @@ explicitState: $:/state/tab-2065006209
 	<$macrocall $name="tabs"
 		tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Saving]!has[draft.of]]"
 		default="$:/core/ui/ControlPanel/Saving/General"
-		explicitState=<<tf.getExplicitState>>
+		explicitState=<<tf.tabs-getExplicitState>>
 	/>
 </div>
diff --git a/core/ui/ControlPanel/Toolbars.tid b/core/ui/ControlPanel/Toolbars.tid
@@ -11,6 +11,6 @@ explicitState: $:/state/tabs/controlpanel/toolbars-1345989671
 		tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Toolbars]!has[draft.of]]"
 		default="$:/core/ui/ControlPanel/Toolbars/ViewToolbar"
 		class="tc-vertical"
-		explicitState=<<tf.getExplicitState>>
+		explicitState=<<tf.tabs-getExplicitState>>
 	/>
 </div>
diff --git a/core/ui/MoreSideBar/Plugins.tid b/core/ui/MoreSideBar/Plugins.tid
@@ -9,5 +9,5 @@ explicitState: $:/state/tab-1163638994
 <$macrocall $name="tabs"
 	tabsList="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar/Plugins]!has[draft.of]]"
 	default="$:/core/ui/MoreSideBar/Plugins/Plugins"
-	explicitState=<<tf.getExplicitState>>
+	explicitState=<<tf.tabs-getExplicitState>>
 />
diff --git a/core/ui/SearchResults.tid b/core/ui/SearchResults.tid
@@ -11,7 +11,7 @@ explicitState: $:/state/tab/search-results/sidebar
 	tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"
 	default={{$:/config/SearchResults/Default}}
 	actions="<$action-setfield $tiddler='$:/state/search/currentTab' text=<<currentTab>>/>"
-	explicitState=<<tf.getExplicitState>>/>
+	explicitState=<<tf.tabs-getExplicitState>>/>
 
 </$list>
 

diff --git a/core/ui/SideBar/More.tid b/core/ui/SideBar/More.tid
@@ -10,6 +10,6 @@ explicitState: $:/state/tab/moresidebar-1850697562
 		default={{$:/config/DefaultMoreSidebarTab}}
 		state="$:/state/tab/moresidebar"
 		class={{{ [{$:/config/ui/SideBar/More/horizontal}match[yes]then[tc-sidebar-tabs-more]else[tc-vertical tc-sidebar-tabs-more]] }}}
-		explicitState=<<tf.getExplicitState>>
+		explicitState=<<tf.tabs-getExplicitState>>
 	/>
 </div>
diff --git a/core/ui/SideBarSegments/tabs.tid b/core/ui/SideBarSegments/tabs.tid
@@ -9,7 +9,7 @@ explicitState: $:/state/tab/sidebar--595412856
 	default={{$:/config/DefaultSidebarTab}}
 	state="$:/state/tab/sidebar"
 	class="tc-sidebar-tabs-main"
-	explicitState=<<tf.getExplicitState>>
+	explicitState=<<tf.tabs-getExplicitState>>
 />
 
 </div>
diff --git a/core/wiki/macros/functions.tid b/core/wiki/macros/functions.tid
diff --git a/core/wiki/macros/tabs.tid b/core/wiki/macros/tabs.tid
@@ -2,6 +2,9 @@ title: $:/core/macros/tabs
 tags: $:/tags/Macro
 code-body: yes
 
+<!-- This global function can be used when the explicitState parameter is used with tabs-macros -->
+\function tf.tabs-getExplicitState() [<currentTab>get[explicitState]] ~[<currentTiddler>get[explicitState]] ~[<thisTiddler>get[explicitState]]
+
 \define tabs-button()
 \whitespace trim
 <$button

diff --git a/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid b/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid
@@ -30,7 +30,7 @@ Other fields used by the core are:
 |`description` |<<lingo description>> |
 |`draft.of` |<<lingo draft.of>> |
 |`draft.title` |<<lingo draft.title>> |
-|`explicitState`|<<.from-version "5.3.4">> <<lingo explicitState>>|
+|`explicitState`|<<.from-version "5.3.6">> <<lingo explicitState>>|
 |`footer` |<<lingo footer>> |
 |`hide-body`|<<lingo hide-body>>|
 |`icon` |<<lingo icon>> |