From a1db2a4795f920d5191f9fb6453455e2ba2464d8 Mon Sep 17 00:00:00 2001 From: yaisog Date: Wed, 20 Dec 2023 08:06:01 +0100 Subject: [PATCH 1/3] Initial commit --- core/ui/EditTemplate/body/default.tid | 7 ++----- core/ui/EditorToolbar/preview.tid | 15 ++------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/core/ui/EditTemplate/body/default.tid b/core/ui/EditTemplate/body/default.tid index 31322f7fa99..0ec3c7c3bcc 100644 --- a/core/ui/EditTemplate/body/default.tid +++ b/core/ui/EditTemplate/body/default.tid @@ -1,9 +1,5 @@ title: $:/core/ui/EditTemplate/body/default -\function edit-preview-state() -[{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[] +[get[text]] :else[[no]] -\end - \define config-visibility-title() $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$ \end @@ -14,11 +10,12 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$ \whitespace trim <$let + editPreviewState={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[] +[get[text]] :else[[no]] }}} importTitle=<> importState=<> > <$dropzone importTitle=<> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<> >
-
+
<$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/> diff --git a/core/ui/EditorToolbar/preview.tid b/core/ui/EditorToolbar/preview.tid index 3c8cef5052d..3aafc5fa2e5 100644 --- a/core/ui/EditorToolbar/preview.tid +++ b/core/ui/EditorToolbar/preview.tid @@ -9,17 +9,6 @@ button-classes: tc-text-editor-toolbar-item-start-group shortcuts: ((preview)) \whitespace trim -<$let - edit-preview-state={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[] }}} -> -<$reveal state=<> type="match" text="yes" tag="span"> -{{$:/core/images/preview-open}} -<$action-setfield $tiddler=<> $value="no"/> +<$transclude $tiddler={{{ [get[text]match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} /> +<$action-setfield $tiddler=<> $value={{{ [get[text]toggle[yes],[no]] }}} /> <$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/> - -<$reveal state=<> type="nomatch" text="yes" tag="span"> -{{$:/core/images/preview-closed}} -<$action-setfield $tiddler=<> $value="yes"/> -<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/> - - From 9e0c786da185909e94b8cf91057482ecc57e1273 Mon Sep 17 00:00:00 2001 From: yaisog Date: Wed, 20 Dec 2023 08:07:47 +0100 Subject: [PATCH 2/3] Put SVG back into a span Needed in case this is targeted in CSS; DOM structure should not be changed. --- core/ui/EditorToolbar/preview.tid | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/ui/EditorToolbar/preview.tid b/core/ui/EditorToolbar/preview.tid index 3aafc5fa2e5..6a90a42fa13 100644 --- a/core/ui/EditorToolbar/preview.tid +++ b/core/ui/EditorToolbar/preview.tid @@ -9,6 +9,8 @@ button-classes: tc-text-editor-toolbar-item-start-group shortcuts: ((preview)) \whitespace trim -<$transclude $tiddler={{{ [get[text]match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} /> + + <$transclude $tiddler={{{ [get[text]match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} /> + <$action-setfield $tiddler=<> $value={{{ [get[text]toggle[yes],[no]] }}} /> <$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/> From 04d490da427fa271410f38a0d3466dfc67de07c3 Mon Sep 17 00:00:00 2001 From: yaisog Date: Wed, 20 Dec 2023 09:23:37 +0100 Subject: [PATCH 3/3] Fix the fix Do it once, do it right. --- core/ui/EditTemplate/body/default.tid | 6 +++--- core/ui/EditorToolbar/preview.tid | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/ui/EditTemplate/body/default.tid b/core/ui/EditTemplate/body/default.tid index 0ec3c7c3bcc..04cc6443697 100644 --- a/core/ui/EditTemplate/body/default.tid +++ b/core/ui/EditTemplate/body/default.tid @@ -10,16 +10,16 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$ \whitespace trim <$let - editPreviewState={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[] +[get[text]] :else[[no]] }}} + editPreviewStateTiddler={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[] }}} importTitle=<> importState=<> > <$dropzone importTitle=<> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<> >
-
+
get[text]match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}}> <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/> -<$list filter="[function[edit-preview-state]match[yes]]" variable="ignore"> +<$list filter="[get[text]match[yes]]" variable="ignore">
diff --git a/core/ui/EditorToolbar/preview.tid b/core/ui/EditorToolbar/preview.tid index 6a90a42fa13..ea49c971a02 100644 --- a/core/ui/EditorToolbar/preview.tid +++ b/core/ui/EditorToolbar/preview.tid @@ -10,7 +10,7 @@ shortcuts: ((preview)) \whitespace trim - <$transclude $tiddler={{{ [get[text]match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} /> + <$transclude $tiddler={{{ [get[text]match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} /> -<$action-setfield $tiddler=<> $value={{{ [get[text]toggle[yes],[no]] }}} /> -<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/> +<$action-setfield $tiddler=<> $value={{{ [get[text]toggle[yes],[no]] }}} /> +<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/> \ No newline at end of file