From 27f3de2f8893e9c112cb22b0203d007a1cbd7d89 Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Mon, 29 Jul 2024 14:08:45 +0200 Subject: [PATCH] Show wikitext formatting buttons for compound tiddlers (#8449) * allow wikitext formatting buttons for types [prefix[text/vnd.tiddlywiki]] which is very permissive * add 2 missing buttons --- core/ui/EditorToolbar/bold.tid | 2 +- core/ui/EditorToolbar/excise.tid | 2 +- core/ui/EditorToolbar/heading-1.tid | 2 +- core/ui/EditorToolbar/heading-2.tid | 2 +- core/ui/EditorToolbar/heading-3.tid | 2 +- core/ui/EditorToolbar/heading-4.tid | 2 +- core/ui/EditorToolbar/heading-5.tid | 2 +- core/ui/EditorToolbar/heading-6.tid | 2 +- core/ui/EditorToolbar/italic.tid | 2 +- core/ui/EditorToolbar/link.tid | 2 +- core/ui/EditorToolbar/linkify.tid | 2 +- core/ui/EditorToolbar/list-bullet.tid | 2 +- core/ui/EditorToolbar/list-number.tid | 2 +- core/ui/EditorToolbar/mono-block.tid | 2 +- core/ui/EditorToolbar/mono-line.tid | 2 +- core/ui/EditorToolbar/picture.tid | 2 +- core/ui/EditorToolbar/quote.tid | 2 +- core/ui/EditorToolbar/strikethrough.tid | 2 +- core/ui/EditorToolbar/subscript.tid | 2 +- core/ui/EditorToolbar/superscript.tid | 2 +- core/ui/EditorToolbar/transcludify.tid | 2 +- core/ui/EditorToolbar/underline.tid | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/core/ui/EditorToolbar/bold.tid b/core/ui/EditorToolbar/bold.tid index ffe84de61..1cde1be39 100644 --- a/core/ui/EditorToolbar/bold.tid +++ b/core/ui/EditorToolbar/bold.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/bold caption: {{$:/language/Buttons/Bold/Caption}} description: {{$:/language/Buttons/Bold/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((bold)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/excise.tid b/core/ui/EditorToolbar/excise.tid index f478abdc2..fe5c5288b 100644 --- a/core/ui/EditorToolbar/excise.tid +++ b/core/ui/EditorToolbar/excise.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/excise caption: {{$:/language/Buttons/Excise/Caption}} description: {{$:/language/Buttons/Excise/Hint}} -condition: [type[]] [type[text/vnd.tiddlywiki]] +[first[]] +condition: [type[]] [get[type]prefix[text/vnd.tiddlywiki]] +[first[]] shortcuts: ((excise)) dropdown: $:/core/ui/EditorToolbar/excise-dropdown diff --git a/core/ui/EditorToolbar/heading-1.tid b/core/ui/EditorToolbar/heading-1.tid index 2f0f41847..d7d2e5032 100644 --- a/core/ui/EditorToolbar/heading-1.tid +++ b/core/ui/EditorToolbar/heading-1.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-1 caption: {{$:/language/Buttons/Heading1/Caption}} description: {{$:/language/Buttons/Heading1/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] button-classes: tc-text-editor-toolbar-item-start-group shortcuts: ((heading-1)) diff --git a/core/ui/EditorToolbar/heading-2.tid b/core/ui/EditorToolbar/heading-2.tid index 7139bf3d0..8f873ad19 100644 --- a/core/ui/EditorToolbar/heading-2.tid +++ b/core/ui/EditorToolbar/heading-2.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-2 caption: {{$:/language/Buttons/Heading2/Caption}} description: {{$:/language/Buttons/Heading2/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-2)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/heading-3.tid b/core/ui/EditorToolbar/heading-3.tid index e00dd832b..96d053cee 100644 --- a/core/ui/EditorToolbar/heading-3.tid +++ b/core/ui/EditorToolbar/heading-3.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-3 caption: {{$:/language/Buttons/Heading3/Caption}} description: {{$:/language/Buttons/Heading3/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-3)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/heading-4.tid b/core/ui/EditorToolbar/heading-4.tid index 4a4b7a90b..c3d373016 100644 --- a/core/ui/EditorToolbar/heading-4.tid +++ b/core/ui/EditorToolbar/heading-4.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-4 caption: {{$:/language/Buttons/Heading4/Caption}} description: {{$:/language/Buttons/Heading4/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-4)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/heading-5.tid b/core/ui/EditorToolbar/heading-5.tid index 09f0bcf4c..fd961df4b 100644 --- a/core/ui/EditorToolbar/heading-5.tid +++ b/core/ui/EditorToolbar/heading-5.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-5 caption: {{$:/language/Buttons/Heading5/Caption}} description: {{$:/language/Buttons/Heading5/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-5)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/heading-6.tid b/core/ui/EditorToolbar/heading-6.tid index d5d8dc045..d573cc89f 100644 --- a/core/ui/EditorToolbar/heading-6.tid +++ b/core/ui/EditorToolbar/heading-6.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/heading-6 caption: {{$:/language/Buttons/Heading6/Caption}} description: {{$:/language/Buttons/Heading6/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((heading-6)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/italic.tid b/core/ui/EditorToolbar/italic.tid index 518f3d0c2..7f3505ddb 100644 --- a/core/ui/EditorToolbar/italic.tid +++ b/core/ui/EditorToolbar/italic.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/italic caption: {{$:/language/Buttons/Italic/Caption}} description: {{$:/language/Buttons/Italic/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((italic)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/link.tid b/core/ui/EditorToolbar/link.tid index e0527cfab..719b05c50 100644 --- a/core/ui/EditorToolbar/link.tid +++ b/core/ui/EditorToolbar/link.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/link caption: {{$:/language/Buttons/Link/Caption}} description: {{$:/language/Buttons/Link/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] button-classes: tc-text-editor-toolbar-item-start-group shortcuts: ((link)) dropdown: $:/core/ui/EditorToolbar/link-dropdown diff --git a/core/ui/EditorToolbar/linkify.tid b/core/ui/EditorToolbar/linkify.tid index 68a45857e..e8b5fed62 100644 --- a/core/ui/EditorToolbar/linkify.tid +++ b/core/ui/EditorToolbar/linkify.tid @@ -1,5 +1,5 @@ caption: {{$:/language/Buttons/Linkify/Caption}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] description: {{$:/language/Buttons/Linkify/Hint}} icon: $:/core/images/linkify list-before: $:/core/ui/EditorToolbar/mono-block diff --git a/core/ui/EditorToolbar/list-bullet.tid b/core/ui/EditorToolbar/list-bullet.tid index dfa14cc18..5a18f77d9 100644 --- a/core/ui/EditorToolbar/list-bullet.tid +++ b/core/ui/EditorToolbar/list-bullet.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/list-bullet caption: {{$:/language/Buttons/ListBullet/Caption}} description: {{$:/language/Buttons/ListBullet/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((list-bullet)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/list-number.tid b/core/ui/EditorToolbar/list-number.tid index 81b9152d0..0bf2ba160 100644 --- a/core/ui/EditorToolbar/list-number.tid +++ b/core/ui/EditorToolbar/list-number.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/list-number caption: {{$:/language/Buttons/ListNumber/Caption}} description: {{$:/language/Buttons/ListNumber/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((list-number)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/mono-block.tid b/core/ui/EditorToolbar/mono-block.tid index 4ef741695..72ec82d90 100644 --- a/core/ui/EditorToolbar/mono-block.tid +++ b/core/ui/EditorToolbar/mono-block.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/mono-block caption: {{$:/language/Buttons/MonoBlock/Caption}} description: {{$:/language/Buttons/MonoBlock/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] button-classes: tc-text-editor-toolbar-item-start-group shortcuts: ((mono-block)) diff --git a/core/ui/EditorToolbar/mono-line.tid b/core/ui/EditorToolbar/mono-line.tid index 15ca77de1..2df863171 100644 --- a/core/ui/EditorToolbar/mono-line.tid +++ b/core/ui/EditorToolbar/mono-line.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/mono-line caption: {{$:/language/Buttons/MonoLine/Caption}} description: {{$:/language/Buttons/MonoLine/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((mono-line)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/picture.tid b/core/ui/EditorToolbar/picture.tid index cf10c0017..0a3fee736 100644 --- a/core/ui/EditorToolbar/picture.tid +++ b/core/ui/EditorToolbar/picture.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/picture caption: {{$:/language/Buttons/Picture/Caption}} description: {{$:/language/Buttons/Picture/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((picture)) dropdown: $:/core/ui/EditorToolbar/picture-dropdown diff --git a/core/ui/EditorToolbar/quote.tid b/core/ui/EditorToolbar/quote.tid index 1fe5fd9e1..d97974325 100644 --- a/core/ui/EditorToolbar/quote.tid +++ b/core/ui/EditorToolbar/quote.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/quote caption: {{$:/language/Buttons/Quote/Caption}} description: {{$:/language/Buttons/Quote/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((quote)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/strikethrough.tid b/core/ui/EditorToolbar/strikethrough.tid index 53808cac3..0b00df486 100644 --- a/core/ui/EditorToolbar/strikethrough.tid +++ b/core/ui/EditorToolbar/strikethrough.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/strikethrough caption: {{$:/language/Buttons/Strikethrough/Caption}} description: {{$:/language/Buttons/Strikethrough/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((strikethrough)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/subscript.tid b/core/ui/EditorToolbar/subscript.tid index e2c83abbd..1c980a896 100644 --- a/core/ui/EditorToolbar/subscript.tid +++ b/core/ui/EditorToolbar/subscript.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/subscript caption: {{$:/language/Buttons/Subscript/Caption}} description: {{$:/language/Buttons/Subscript/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((subscript)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/superscript.tid b/core/ui/EditorToolbar/superscript.tid index c1a40efea..ee4713409 100644 --- a/core/ui/EditorToolbar/superscript.tid +++ b/core/ui/EditorToolbar/superscript.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/superscript caption: {{$:/language/Buttons/Superscript/Caption}} description: {{$:/language/Buttons/Superscript/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((superscript)) <$action-sendmessage diff --git a/core/ui/EditorToolbar/transcludify.tid b/core/ui/EditorToolbar/transcludify.tid index dbc008d56..d24b2041c 100644 --- a/core/ui/EditorToolbar/transcludify.tid +++ b/core/ui/EditorToolbar/transcludify.tid @@ -1,5 +1,5 @@ caption: {{$:/language/Buttons/Transcludify/Caption}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] description: {{$:/language/Buttons/Transcludify/Hint}} icon: $:/core/images/transcludify list-before: $:/core/ui/EditorToolbar/mono-block diff --git a/core/ui/EditorToolbar/underline.tid b/core/ui/EditorToolbar/underline.tid index ec6d63319..9f0fc9c30 100644 --- a/core/ui/EditorToolbar/underline.tid +++ b/core/ui/EditorToolbar/underline.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar icon: $:/core/images/underline caption: {{$:/language/Buttons/Underline/Caption}} description: {{$:/language/Buttons/Underline/Hint}} -condition: [!has[type]] [type[text/vnd.tiddlywiki]] +condition: [!has[type]] [get[type]prefix[text/vnd.tiddlywiki]] shortcuts: ((underline)) <$action-sendmessage