From 2b0c634fb8ee7566407ebf7051898eead5e5257f Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Wed, 8 Jan 2025 21:37:44 +0000
Subject: [PATCH] Refactor actions for recompiling current palette

---
 core/palette-templates/TwentyTwentiesEditor.tid | 16 ++++++----------
 core/wiki/macros/CSS.tid                        |  4 ++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/palette-templates/TwentyTwentiesEditor.tid b/core/palette-templates/TwentyTwentiesEditor.tid
index aa97770f2..ff99657d6 100644
--- a/core/palette-templates/TwentyTwentiesEditor.tid
+++ b/core/palette-templates/TwentyTwentiesEditor.tid
@@ -1,18 +1,14 @@
 title: $:/palette-editors/TwentyTwenties
 
-\procedure actionsRecompilePalette()
-<$transclude $variable="actions-compile-palette" inputTitle={{$:/palette}} outputTitle="$:/temp/palette-colours"/>
-\end actionsRecompilePalette
+paper: <$edit-text tiddler={{$:/palette}} index="base-paper" type="color" tag="input" inputActions=<<actions-recompile-current-palette>>/>
 
-paper: <$edit-text tiddler={{$:/palette}} index="base-paper" type="color" tag="input" inputActions=<<actionsRecompilePalette>>/>
+background: <$edit-text tiddler={{$:/palette}} index="base-background" type="color" tag="input" inputActions=<<actions-recompile-current-palette>>/>
 
-background: <$edit-text tiddler={{$:/palette}} index="base-background" type="color" tag="input" inputActions=<<actionsRecompilePalette>>/>
+ink: <$edit-text tiddler={{$:/palette}} index="base-ink" type="color" tag="input" inputActions=<<actions-recompile-current-palette>>/>
 
-ink: <$edit-text tiddler={{$:/palette}} index="base-ink" type="color" tag="input" inputActions=<<actionsRecompilePalette>>/>
+primary: <$edit-text tiddler={{$:/palette}} index="base-primary" type="color" tag="input" inputActions=<<actions-recompile-current-palette>>/>
 
-primary: <$edit-text tiddler={{$:/palette}} index="base-primary" type="color" tag="input" inputActions=<<actionsRecompilePalette>>/>
+secondary: <$edit-text tiddler={{$:/palette}} index="base-secondary" type="color" tag="input" inputActions=<<actions-recompile-current-palette>>/>
 
-secondary: <$edit-text tiddler={{$:/palette}} index="base-secondary" type="color" tag="input" inputActions=<<actionsRecompilePalette>>/>
-
-tertiary: <$edit-text tiddler={{$:/palette}} index="base-tertiary" type="color" tag="input" inputActions=<<actionsRecompilePalette>>/>
+tertiary: <$edit-text tiddler={{$:/palette}} index="base-tertiary" type="color" tag="input" inputActions=<<actions-recompile-current-palette>>/>
 
diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid
index 4cc8d69d9..37587b9a5 100644
--- a/core/wiki/macros/CSS.tid
+++ b/core/wiki/macros/CSS.tid
@@ -62,6 +62,10 @@ tags: $:/tags/Macro
 </$let>
 \end actions-compile-palette
 
+\procedure actions-recompile-current-palette()
+<$transclude $variable="actions-compile-palette" inputTitle={{$:/palette}} outputTitle="$:/temp/palette-colours"/>
+\end actions-recompile-current-palette
+
 \procedure actions-switch-colour-palette(paletteTitle)
 \procedure tv-action-refresh-policy() always
 <$action-deletetiddler $tiddler="$:/temp/palette-colours"/>