From c1fd82f50f7a949d58cf05ef464144d29c2b30b7 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Tue, 28 Jan 2025 15:44:42 +0000
Subject: [PATCH] Minor cleanups

---
 core/modules/background-actions.js |  2 +-
 core/wiki/macros/CSS.tid           | 21 ++++++++-------------
 core/wiki/paletteswitcher.tid      |  2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/core/modules/background-actions.js b/core/modules/background-actions.js
index bfeb03338..6e8ad5bd0 100644
--- a/core/modules/background-actions.js
+++ b/core/modules/background-actions.js
@@ -105,7 +105,7 @@ function BackgroundActionTracker(options) {
 						self.actions,
 						null,
 						{
-							title: self.title
+							currentTiddler: self.title
 						},{
 							parentWidget: $tw.rootWidget
 						}
diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid
index 178990328..499f8473a 100644
--- a/core/wiki/macros/CSS.tid
+++ b/core/wiki/macros/CSS.tid
@@ -3,18 +3,14 @@ tags: $:/tags/Macro
 
 \procedure actions-compile-palette-filtered(tempPalette,outputTitle)
 <!-- Note the join, needed to cope with palette entries containing spaces -->
-\function colour(name) [<tv-palette-name>getindex<name>] :else[<tv-palette-name>get[palette-import]getindex<name>] :map[subfilter<currentTiddler>join[ ]]
+\function colour(name) [<tempPalette>getindex<name>] :else[[$:/config/DefaultColourMappings/]addsuffix<name>get[text]] :map[subfilter<currentTiddler>join[ ]]
 <!-- Make the colour function use the input palette -->
-<$let
-	tv-palette-name=<<tempPalette>>
->
-	<$list filter="[<tempPalette>indexes[]sort[]]" variable="colour-name">
-		<$let colour-filter={{{ [<tempPalette>getindex<colour-name>] }}}>
-			<!-- Note the join, needed to cope with palette entries containing spaces -->
-			<$action-setfield $tiddler=<<outputTitle>> $index=<<colour-name>> $value={{{ [subfilter<colour-filter>join[ ]] }}}/>
-		</$let>
-	</$list>
-</$let>
+<$list filter="[<tempPalette>indexes[]sort[]]" variable="colour-name">
+	<$let colour-filter={{{ [<tempPalette>getindex<colour-name>] }}}>
+		<!-- Note the join, needed to cope with palette entries containing spaces -->
+		<$action-setfield $tiddler=<<outputTitle>> $index=<<colour-name>> $value={{{ [subfilter<colour-filter>join[ ]] }}}/>
+	</$let>
+</$list>
 \end actions-compile-palette-filtered
 
 \procedure actions-compile-palette-wikified(tempPalette,outputTitle)
@@ -36,7 +32,7 @@ tags: $:/tags/Macro
 \procedure actions-compile-palette(inputTitle,outputTitle,defaultImport="$:/palettes/Vanilla")
 \procedure tv-action-refresh-policy() always
 <$let
-	tempPalette="$:/temp/palette-source"
+	tempPalette="$:/temp/palette-consolidated"
 >
 	<!-- Clear the temporary consolidated palette -->
 	<$action-deletetiddler $tiddler=<<tempPalette>>/>
@@ -71,7 +67,6 @@ tags: $:/tags/Macro
 \procedure actions-switch-colour-palette(paletteTitle)
 \procedure tv-action-refresh-policy() always
 <$action-deletetiddler $tiddler="$:/temp/palette-colours"/>
-<$action-setfield $tiddler="$:/palette" $field="text" $value=<<paletteTitle>>/>
 <<actions-recompile-current-palette>>
 \end actions-switch-colour-palette
 
diff --git a/core/wiki/paletteswitcher.tid b/core/wiki/paletteswitcher.tid
index 81052e9c5..e7545de07 100644
--- a/core/wiki/paletteswitcher.tid
+++ b/core/wiki/paletteswitcher.tid
@@ -4,7 +4,7 @@ title: $:/snippets/paletteswitcher
 
 \whitespace trim
 \procedure actions()
-<$transclude $variable="actions-switch-colour-palette" paletteTitle=<<navigateTo>>/>
+<$action-setfield $tiddler="$:/palette" text=<<navigateTo>>/>
 \end actions
 
 <$linkcatcher actions=<<actions>>>