diff --git a/core/ui/Actions/new-journal.tid b/core/ui/Actions/new-journal.tid index 9d663e537c..c885880f4e 100644 --- a/core/ui/Actions/new-journal.tid +++ b/core/ui/Actions/new-journal.tid @@ -4,13 +4,15 @@ description: create a new journal tiddler \whitespace trim \function get-tags() [] [] +[join[ ]] -<$let journalTitleTemplate={{$:/config/NewJournal/Title}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}> -<$wikify name="journalTitle" text="<$transclude $variable='now' format=<>/>"> +<$let journalTitle=<> + textFieldTags={{$:/config/NewJournal/Tags}} + tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} + journalText={{$:/config/NewJournal/Text}} +> <$reveal type="nomatch" state=<> text=""> <$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text={{{ [get[]] }}}/> <$reveal type="match" state=<> text=""> <$action-sendmessage $message="tm-new-tiddler" title=<> tags=<> text=<>/> - diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid index bbd3d301eb..20e1cad8e5 100644 --- a/core/ui/EditTemplate/tags.tid +++ b/core/ui/EditTemplate/tags.tid @@ -6,30 +6,23 @@ tags: $:/tags/EditTemplate \procedure lingo-base() $:/language/EditTemplate/ \procedure tag-body-inner(colour,fallbackTarget,colourA,colourB,icon,tagField:"tags") -<$wikify name="foregroundColor" - text="""<$macrocall $name="contrastcolour" - target=<> - fallbackTarget=<> - colourA=<> - colourB=<>/> - """ -> - <$let backgroundColor=<> > - > - style=`color:$(foregroundColor)$; fill:$(foregroundColor)$; background-color:$(backgroundColor)$;` +<$let foregroundColor=<> fallbackTarget=<> colourA=<> colourB=<> >> + backgroundColor=<> +> + > + style=`color:$(foregroundColor)$; fill:$(foregroundColor)$; background-color:$(backgroundColor)$;` + > + <$transclude tiddler=<>/> + <$view field="title" format="text"/> + <$button class="tc-btn-invisible tc-remove-tag-button" + style.fill=<> > - <$transclude tiddler=<>/> - <$view field="title" format="text"/> - <$button class="tc-btn-invisible tc-remove-tag-button" - style.fill=<> - > - <$action-listops $tiddler=<> $field=<> $subfilter="-[{!!title}]"/> - {{$:/core/images/close-button}} - - - - + <$action-listops $tiddler=<> $field=<> $subfilter="-[{!!title}]"/> + {{$:/core/images/close-button}} + + + \end \procedure tag-body(colour,palette,icon,tagField:"tags") diff --git a/core/ui/TagPickerTagTemplate.tid b/core/ui/TagPickerTagTemplate.tid index 9e86891539..6083609f96 100644 --- a/core/ui/TagPickerTagTemplate.tid +++ b/core/ui/TagPickerTagTemplate.tid @@ -16,15 +16,13 @@ title: $:/core/ui/TagPickerTagTemplate <$set name="backgroundColor" value={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} > - <$wikify name="foregroundColor" - text="""<$macrocall $name="contrastcolour" target=<> fallbackTarget=<> colourA=<> colourB=<>/>""" - > + <$let foregroundColor=<> fallbackTarget=<> colourA=<> colourB=<> >> > > data-tag-title=<> > {{||$:/core/ui/TiddlerIcon}}<$view field="title" format="text"/> - + diff --git a/core/ui/ViewToolbar/new-journal-here.tid b/core/ui/ViewToolbar/new-journal-here.tid index 2df7a2a4e6..cba1889b7d 100644 --- a/core/ui/ViewToolbar/new-journal-here.tid +++ b/core/ui/ViewToolbar/new-journal-here.tid @@ -6,7 +6,6 @@ description: {{$:/language/Buttons/NewJournalHere/Hint}} \whitespace trim \procedure journalButton() <$button tooltip={{$:/language/Buttons/NewJournalHere/Hint}} aria-label={{$:/language/Buttons/NewJournalHere/Caption}} class=<>> -<$wikify name="journalTitle" text="""<$transclude $variable="now" format=<>/>"""> <$action-sendmessage $message="tm-new-tiddler" title=<> tags=`[[$(currentTiddlerTag)$]] $(journalTags)$`/> <%if [match[yes]] %> {{$:/core/images/new-journal-button}} @@ -16,9 +15,11 @@ description: {{$:/language/Buttons/NewJournalHere/Hint}} <$text text={{$:/language/Buttons/NewJournalHere/Caption}}/> <%endif%> - \end -<$let journalTitleTemplate={{$:/config/NewJournal/Title}} journalTags={{$:/config/NewJournal/Tags}} currentTiddlerTag=<>> +<$let journalTitle=<> + journalTags={{$:/config/NewJournal/Tags}} + currentTiddlerTag=<> +> <> diff --git a/editions/tw5.com/tiddlers/releasenotes/5.5.0/#9816.tid b/editions/tw5.com/tiddlers/releasenotes/5.5.0/#9816.tid new file mode 100644 index 0000000000..9703761ca3 --- /dev/null +++ b/editions/tw5.com/tiddlers/releasenotes/5.5.0/#9816.tid @@ -0,0 +1,10 @@ + title: $:/changenotes/5.5.0/#9816 +description: Replaces some wikify widget with call dynamic syntax +release: 5.5.0 +tags: $:/tags/ChangeNote +change-type: enhancement +change-category: internal +github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9816 +github-contributors: Leilei332 + +Replaces unnecessary wikify widget usage with call dynamic attribute syntax. \ No newline at end of file