From e274a0c7d19ec4b11f3f50136b418e5b6a8e1f60 Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Mon, 11 Nov 2013 15:27:12 +0000
Subject: [PATCH] Make sure we use state tiddler titles in the `$:/state`
 namespace

---
 core/ui/PageMacros.tid          | 2 +-
 core/ui/SideBar.tid             | 2 +-
 core/ui/SideBar/More.tid        | 2 +-
 core/wiki/moreSideBarTabSet.tid | 2 +-
 core/wiki/sideBarTabSet.tid     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/ui/PageMacros.tid b/core/ui/PageMacros.tid
index 0cdaefc1f..0709c55a7 100644
--- a/core/ui/PageMacros.tid
+++ b/core/ui/PageMacros.tid
@@ -1,6 +1,6 @@
 title: $:/core/ui/PageMacros
 
-\define tabs(tabsList,default,state:"$:/currentTab")
+\define tabs(tabsList,default,state:"$:/state/tab")
 <div class="tw-tab-buttons"><$list filter="$tabsList$" variable="currentTab"><$button set=<<qualify "$state$">> setTo=<<currentTab>> default="$default$" selectedClass="tw-tab-selected"><$view tiddler=<<currentTab>> field="caption"><$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/></$view> </$button>
 </$list>
 </div>
diff --git a/core/ui/SideBar.tid b/core/ui/SideBar.tid
index e5b352787..e14297b8a 100644
--- a/core/ui/SideBar.tid
+++ b/core/ui/SideBar.tid
@@ -24,7 +24,7 @@ title: $:/core/ui/SideBar
 
 <$reveal state="$:/temp/search" type="match" text="">
 
-<<tabs "[is[shadow]!has[draft.of]tag[$:/tags/SideBar]] [!is[shadow]!has[draft.of]tag[$:/tags/SideBar]]" "$:/core/ui/SideBar/Open" "$:/sidebartab">>
+<<tabs "[is[shadow]!has[draft.of]tag[$:/tags/SideBar]] [!is[shadow]!has[draft.of]tag[$:/tags/SideBar]]" "$:/core/ui/SideBar/Open" "$:/state/tab/sidebar">>
 
 </$reveal>
 </div>
diff --git a/core/ui/SideBar/More.tid b/core/ui/SideBar/More.tid
index 89f3e9a7c..2502a55fe 100644
--- a/core/ui/SideBar/More.tid
+++ b/core/ui/SideBar/More.tid
@@ -3,5 +3,5 @@ tags: $:/tags/SideBar
 caption: More
 
 <div class="tw-more-sidebar">
-<<tabs "[is[shadow]!has[draft.of]tag[$:/tags/MoreSideBar]] [!is[shadow]!has[draft.of]tag[$:/tags/MoreSideBar]]" "$:/core/ui/MoreSideBar/Open" "$:/moresidebartab">>
+<<tabs "[is[shadow]!has[draft.of]tag[$:/tags/MoreSideBar]] [!is[shadow]!has[draft.of]tag[$:/tags/MoreSideBar]]" "$:/core/ui/MoreSideBar/Open" "$:/state/tab/moresidebar">>
 </div>
diff --git a/core/wiki/moreSideBarTabSet.tid b/core/wiki/moreSideBarTabSet.tid
index 3724434ae..8a3de1767 100644
--- a/core/wiki/moreSideBarTabSet.tid
+++ b/core/wiki/moreSideBarTabSet.tid
@@ -1,3 +1,3 @@
-title: $:/moresidebartab-{$:/core/ui/SideBar|$:/core/ui/SideBar/More||}{$:/core/ui/SideBar|$:/core/ui/SideBar||}{$:/core/ui/PageTemplate|$:/core/ui/PageTemplate||}
+title: $:/state/tab/moresidebar-{$:/core/ui/SideBar|$:/core/ui/SideBar/More||}{$:/core/ui/SideBar|$:/core/ui/SideBar||}{$:/core/ui/PageTemplate|$:/core/ui/PageTemplate||}
 
 $:/core/ui/MoreSideBar/Tags
\ No newline at end of file
diff --git a/core/wiki/sideBarTabSet.tid b/core/wiki/sideBarTabSet.tid
index 12d1d8b3f..c00d4d40d 100644
--- a/core/wiki/sideBarTabSet.tid
+++ b/core/wiki/sideBarTabSet.tid
@@ -1,3 +1,3 @@
-title: $:/state/sideBarTabSet-{$:/core/ui/SideBar|$:/core/ui/SideBar||}{$:/core/ui/PageTemplate|$:/core/ui/PageTemplate||}
+title: $:/state/tab/sidebar-{$:/core/ui/SideBar|$:/core/ui/SideBar||}{$:/core/ui/PageTemplate|$:/core/ui/PageTemplate||}
 
 $:/core/ui/SideBar/Open
\ No newline at end of file