Skip to content

Commit 2bd4c38

Browse files
JermoleneJermolene
authored
Revert "Migrate some old macros to new syntax (#8768)" (#9160)
This reverts commit 2801eee.
1 parent 89030c4 commit 2bd4c38

File tree

6 files changed

+115
-102
lines changed

6 files changed

+115
-102
lines changed

‎core/wiki/macros/colour-picker.tid‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,58 @@
11
title: $:/core/macros/colour-picker
22
tags: $:/tags/Macro
33

4-
\procedure colour-picker-update-recent()
4+
\define colour-picker-update-recent()
55
<$action-listops
66
$tiddler="$:/config/ColourPicker/Recent"
7-
$subfilter="[<colour-picker-value>] [list[$:/config/ColourPicker/Recent]remove<colour-picker-value>] +[limit[8]]"
7+
$subfilter="$(colour-picker-value)$ [list[$:/config/ColourPicker/Recent]remove[$(colour-picker-value)$]] +[limit[8]]"
88
/>
99
\end
1010

11-
\procedure colour-picker-inner(actions)
12-
<$button tag="a" tooltip=<<colour-picker-value>>>
13-
<<colour-picker-update-recent>>
14-
<$transclude $variable="actions"/>
15-
<span style.display="inline-block" style.backgroundColor=<<colour-picker-value>> style.width="100%" style.height="100%" style.borderRadius="50%"/>
11+
\define colour-picker-inner(actions)
12+
<$button tag="a" tooltip="""$(colour-picker-value)$""">
13+
$(colour-picker-update-recent)$
14+
<$transclude $variable="__actions__"/>
15+
16+
<span style="display:inline-block; background-color: $(colour-picker-value)$; width: 100%; height: 100%; border-radius: 50%;"/>
17+
1618
</$button>
1719
\end
1820

21+
\define colour-picker-recent-inner(actions)
1922
\whitespace trim
20-
\procedure colour-picker-recent-inner(actions)
21-
<$set name="colour-picker-value" value=<<recentColour>>>
22-
<$transclude $variable="colour-picker-inner" actions=<<actions>>/>
23+
<$set name="colour-picker-value" value="$(recentColour)$">
24+
<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
2325
</$set>
2426
\end
2527

26-
\procedure colour-picker-recent(actions)
28+
\define colour-picker-recent(actions)
29+
\whitespace trim
2730
{{$:/language/ColourPicker/Recent}}<$list filter="[list[$:/config/ColourPicker/Recent]]" variable="recentColour">
2831
&#32;
29-
<$transclude $variable="colour-picker-recent-inner" actions=<<actions>>/>
32+
<$macrocall $name="colour-picker-recent-inner" actions=<<__actions__>>/>
3033
</$list>
3134
\end
3235

33-
\procedure colour-picker(actions)
36+
\define colour-picker(actions)
37+
\whitespace trim
3438
<div class="tc-colour-chooser">
3539

36-
<$transclude $variable="colour-picker-recent" actions=<<actions>>/>
40+
<$macrocall $name="colour-picker-recent" actions=<<__actions__>>/>
3741

3842
---
3943

4044
<$list filter="LightPink Pink Crimson LavenderBlush PaleVioletRed HotPink DeepPink MediumVioletRed Orchid Thistle Plum Violet Magenta Fuchsia DarkMagenta Purple MediumOrchid DarkViolet DarkOrchid Indigo BlueViolet MediumPurple MediumSlateBlue SlateBlue DarkSlateBlue Lavender GhostWhite Blue MediumBlue MidnightBlue DarkBlue Navy RoyalBlue CornflowerBlue LightSteelBlue LightSlateGrey SlateGrey DodgerBlue AliceBlue SteelBlue LightSkyBlue SkyBlue DeepSkyBlue LightBlue PowderBlue CadetBlue Azure LightCyan PaleTurquoise Cyan Aqua DarkTurquoise DarkSlateGrey DarkCyan Teal MediumTurquoise LightSeaGreen Turquoise Aquamarine MediumAquamarine MediumSpringGreen MintCream SpringGreen MediumSeaGreen SeaGreen Honeydew LightGreen PaleGreen DarkSeaGreen LimeGreen Lime ForestGreen Green DarkGreen Chartreuse LawnGreen GreenYellow DarkOliveGreen YellowGreen OliveDrab Beige LightGoldenrodYellow Ivory LightYellow Yellow Olive DarkKhaki LemonChiffon PaleGoldenrod Khaki Gold Cornsilk Goldenrod DarkGoldenrod FloralWhite OldLace Wheat Moccasin Orange PapayaWhip BlanchedAlmond NavajoWhite AntiqueWhite Tan BurlyWood Bisque DarkOrange Linen Peru PeachPuff SandyBrown Chocolate SaddleBrown Seashell Sienna LightSalmon Coral OrangeRed DarkSalmon Tomato MistyRose Salmon Snow LightCoral RosyBrown IndianRed Red Brown FireBrick DarkRed Maroon White WhiteSmoke Gainsboro LightGrey Silver DarkGrey Grey DimGrey Black" variable="colour-picker-value">
4145
&#32;
42-
<$transclude $variable="colour-picker-inner" actions=<<actions>>/>
46+
<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
4347
</$list>
4448

4549
---
4650

47-
<$edit-text tiddler="$:/config/ColourPicker/New" tag="input" default="" placeholder="" class="tc-tiny-gap-right"/>
51+
<$edit-text tiddler="$:/config/ColourPicker/New" tag="input" default="" placeholder=""/>
52+
&#32;
4853
<$edit-text tiddler="$:/config/ColourPicker/New" type="color" tag="input"/>
4954
<$set name="colour-picker-value" value={{$:/config/ColourPicker/New}}>
50-
<%if [{$:/config/ColourPicker/New}!is[blank]] %>
51-
<$transclude $variable="colour-picker-inner" actions=<<actions>>/>
52-
<%endif%>
55+
<$macrocall $name="colour-picker-inner" actions=<<__actions__>>/>
5356
</$set>
5457

5558
</div>

‎core/wiki/macros/dumpvariables.tid‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
title: $:/core/macros/dumpvariables
22
tags: $:/tags/Macro
33

4-
\procedure dumpvariables()
4+
\define dumpvariables()
55
\whitespace trim
66
<ul>
77
<$list filter="[variables[]]" variable="varname">

‎core/wiki/macros/image-picker.tid‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,39 @@
1+
created: 20170715180840889
2+
modified: 20170715180914005
13
tags: $:/tags/Macro
24
title: $:/core/macros/image-picker
35
type: text/vnd.tiddlywiki
46

5-
\procedure image-picker-thumbnail(actions)
6-
<$button tag="a" tooltip=<<imageTitle>>><$transclude $variable="actions"/><$transclude tiddler=<<imageTitle>>/></$button>
7+
\define image-picker-thumbnail(actions)
8+
<$button tag="a" tooltip="""$(imageTitle)$"""><$transclude $variable="__actions__"/><$transclude tiddler=<<imageTitle>>/></$button>
79
\end
810

9-
\procedure image-picker-list(filter,actions)
11+
\define image-picker-list(filter,actions)
1012
\whitespace trim
11-
<$list filter=<<filter>> variable="imageTitle">
12-
<$transclude $variable="image-picker-thumbnail" actions=<<actions>>/>
13+
<$list filter="""$filter$""" variable="imageTitle">
14+
<$macrocall $name="image-picker-thumbnail" actions=<<__actions__>>/>
1315
&#32;
1416
</$list>
1517
\end
1618

17-
\procedure image-picker(actions,filter:"[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[!has[draft.of]$subfilter$sort[title]]",subfilter:"")
19+
\define image-picker(actions,filter:"[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[!has[draft.of]$subfilter$sort[title]]",subfilter:"")
1820
\whitespace trim
1921
<div class="tc-image-chooser">
20-
<$let state-system=<<qualify "$:/state/image-picker/system">> tv-filter={{{ [<filter>search-replace[$subfilter$],<subfilter>] }}}>
22+
<$vars state-system=<<qualify "$:/state/image-picker/system">>>
2123
<$checkbox tiddler=<<state-system>> field="text" checked="show" unchecked="hide" default="hide">
22-
<span class="tc-tiny-gap-left">{{$:/language/SystemTiddlers/Include/Prompt}}</span>
24+
&#32;
25+
{{$:/language/SystemTiddlers/Include/Prompt}}
2326
</$checkbox>
2427
<$reveal state=<<state-system>> type="match" text="hide" default="hide" tag="div">
25-
<$transclude $variable="image-picker-list" filter=`$(tv-filter)$ +[!is[system]]` actions=<<actions>>/>
28+
<$macrocall $name="image-picker-list" filter="""$filter$ +[!is[system]]""" actions=<<__actions__>>/>
2629
</$reveal>
2730
<$reveal state=<<state-system>> type="nomatch" text="hide" default="hide" tag="div">
28-
<$transclude $variable="image-picker-list" filter=<<tv-filter>> actions=<<actions>>/>
31+
<$macrocall $name="image-picker-list" filter="""$filter$""" actions=<<__actions__>>/>
2932
</$reveal>
30-
</$let>
33+
</$vars>
3134
</div>
3235
\end
3336

34-
\procedure image-picker-include-tagged-images(actions)
35-
<$transclude $variable="image-picker" filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[!has[draft.of]sort[title]]" actions=<<actions>>/>
37+
\define image-picker-include-tagged-images(actions)
38+
<$macrocall $name="image-picker" filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[!has[draft.of]sort[title]]" actions=<<__actions__>>/>
3639
\end

‎core/wiki/macros/list.tid‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
title: $:/core/macros/list
22
tags: $:/tags/Macro
33

4-
\procedure list-links-draggable-drop-actions()
5-
<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
6-
\end
7-
4+
\define list-links(filter,type:"ul",subtype:"li",class:"",emptyMessage,field:"caption")
85
\whitespace trim
9-
\procedure list-links(filter,type:"ul",subtype:"li",class:"",emptyMessage,field:"caption")
10-
<$genesis $type=<<type>> class=<<class>>>
11-
<$list filter=<<filter>> emptyMessage=<<emptyMessage>>>
12-
<$genesis $type=<<subtype>>>
6+
<$genesis $type=<<__type__>> class=<<__class__>>>
7+
<$list filter=<<__filter__>> emptyMessage=<<__emptyMessage__>>>
8+
<$genesis $type=<<__subtype__>>>
139
<$link to={{!!title}}>
1410
<$let tv-wikilinks="no">
15-
<$transclude field=<<field>>>
11+
<$transclude field=<<__field__>>>
1612
<$view field="title"/>
1713
</$transclude>
1814
</$let>
@@ -22,19 +18,24 @@ tags: $:/tags/Macro
2218
</$genesis>
2319
\end
2420

25-
\procedure list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate)
21+
\define list-links-draggable-drop-actions()
22+
<$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
23+
\end
24+
25+
\define list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate)
26+
\whitespace trim
2627
<span class="tc-links-draggable-list">
27-
<$let targetTiddler=<<tiddler>> targetField=<<field>>>
28-
<$genesis $type=<<type>> class=<<class>>>
29-
<$list filter="[<tiddler>get<field>enlist-input[]]" emptyMessage=<<emptyMessage>>>
28+
<$vars targetTiddler="""$tiddler$""" targetField="""$field$""">
29+
<$genesis $type=<<__type__>> class="$class$">
30+
<$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>>
3031
<$droppable
3132
actions=<<list-links-draggable-drop-actions>>
32-
tag=<<subtype>>
33+
tag="""$subtype$"""
3334
enable=<<tv-enable-drag-and-drop>>
3435
>
3536
<div class="tc-droppable-placeholder"/>
3637
<div>
37-
<$transclude tiddler=<<itemTemplate>>>
38+
<$transclude tiddler="""$itemTemplate$""">
3839
<$link to={{!!title}}>
3940
<$let tv-wikilinks="no">
4041
<$transclude field="caption">
@@ -59,48 +60,50 @@ tags: $:/tags/Macro
5960
</$droppable>
6061
</$tiddler>
6162
</$genesis>
62-
</$let>
63+
</$vars>
6364
</span>
6465
\end
6566

66-
\procedure list-tagged-draggable-drop-actions(tag)
67+
\define list-tagged-draggable-drop-actions(tag)
68+
\whitespace trim
6769
<!-- Save the current ordering of the tiddlers with this tag -->
68-
<$set name="order" filter="[<tag>tagging[]]">
70+
<$set name="order" filter="[<__tag__>tagging[]]">
6971
<!-- Remove any list-after or list-before fields from the tiddlers with this tag -->
70-
<$list filter="[<tag>tagging[]]">
72+
<$list filter="[<__tag__>tagging[]]">
7173
<$action-deletefield $field="list-before"/>
7274
<$action-deletefield $field="list-after"/>
7375
</$list>
7476
<!-- Save the new order to the Tag Tiddler -->
75-
<$action-listops $tiddler=<<tag>> $field="list" $filter="+[enlist<order>] +[insertbefore<actionTiddler>,<currentTiddler>]"/>
77+
<$action-listops $tiddler=<<__tag__>> $field="list" $filter="+[enlist<order>] +[insertbefore<actionTiddler>,<currentTiddler>]"/>
7678
<!-- Make sure the newly added item has the right tag -->
7779
<!-- Removing this line makes dragging tags within the dropdown work as intended -->
78-
<!--<$action-listops $tiddler=<<actionTiddler>> $tags=<<tag>>/>-->
80+
<!--<$action-listops $tiddler=<<actionTiddler>> $tags=<<__tag__>>/>-->
7981
<!-- Using the following 5 lines as replacement makes dragging titles from outside into the dropdown apply the tag -->
80-
<$list filter="[<actionTiddler>!contains:tags<tag>]">
82+
<$list filter="[<actionTiddler>!contains:tags<__tag__>]">
8183
<$fieldmangler tiddler=<<actionTiddler>>>
82-
<$action-sendmessage $message="tm-add-tag" $param=<<tag>>/>
84+
<$action-sendmessage $message="tm-add-tag" $param=<<__tag__>>/>
8385
</$fieldmangler>
8486
</$list>
8587
</$set>
8688
\end
8789

88-
\procedure list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"")
90+
\define list-tagged-draggable(tag,subFilter,emptyMessage,itemTemplate,elementTag:"div",storyview:"")
91+
\whitespace trim
8992
<span class="tc-tagged-draggable-list">
90-
<$set name="tag" value=<<tag>>>
93+
<$set name="tag" value=<<__tag__>>>
9194
<$list
92-
filter=`[<tag>tagging[]$(subFilter)$]`
93-
emptyMessage=<<emptyMessage>>
94-
storyview=<<storyview>>
95+
filter="[<__tag__>tagging[]$subFilter$]"
96+
emptyMessage=<<__emptyMessage__>>
97+
storyview=<<__storyview__>>
9598
>
96-
<$genesis $type=<<elementTag>> class="tc-menu-list-item">
99+
<$genesis $type=<<__elementTag__>> class="tc-menu-list-item">
97100
<$droppable
98-
actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<tag>>/>"""
101+
actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>"""
99102
enable=<<tv-enable-drag-and-drop>>
100103
>
101-
<$genesis $type=<<elementTag>> class="tc-droppable-placeholder"/>
102-
<$genesis $type=<<elementTag>>>
103-
<$transclude tiddler=<<itemTemplate>>>
104+
<$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/>
105+
<$genesis $type=<<__elementTag__>>>
106+
<$transclude tiddler="""$itemTemplate$""">
104107
<$link to={{!!title}}>
105108
<$let tv-wikilinks="no">
106109
<$transclude field="caption">
@@ -115,11 +118,11 @@ tags: $:/tags/Macro
115118
</$list>
116119
<$tiddler tiddler="">
117120
<$droppable
118-
actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<tag>>/>"""
121+
actions="""<$macrocall $name="list-tagged-draggable-drop-actions" tag=<<__tag__>>/>"""
119122
enable=<<tv-enable-drag-and-drop>>
120123
>
121-
<$genesis $type=<<elementTag>> class="tc-droppable-placeholder"/>
122-
<$genesis $type=<<elementTag>> style="height:0.5em;"/>
124+
<$genesis $type=<<__elementTag__>> class="tc-droppable-placeholder"/>
125+
<$genesis $type=<<__elementTag__>> style="height:0.5em;"/>
123126
</$droppable>
124127
</$tiddler>
125128
</$set>

‎core/wiki/macros/translink.tid‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
title: $:/core/macros/translink
22
tags: $:/tags/Macro
33

4-
\procedure translink(title,mode:"block")
4+
\define translink(title,mode:"block")
55
\whitespace trim
6-
<%if [<mode>match[block]] %>
6+
<$list filter="[<__mode__>match[block]]">
77
<div class="tc-translink">
88
<div>
9-
<$link to=<<title>>>
10-
<h1><$text text=<<title>>/></h1>
9+
<$link to="""$title$""">
10+
<h1><$text text="""$title$"""/></h1>
1111
</$link>
12-
<$transclude tiddler=<<title>> mode="block">
13-
<$set name="currentTiddler" value=<<title>>><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
12+
<$transclude tiddler="""$title$""" mode="block">
13+
<$set name="currentTiddler" value="""$title$"""><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
1414
</$transclude>
1515
</div>
1616
</div>
17-
<%endif%>
18-
<%if [<mode>match[inline]] %>
17+
</$list>
18+
<$list filter="[<__mode__>match[inline]]">
1919
<span class="tc-translink">
20-
<$link to=<<title>> class="tc-tiny-gap-right">
21-
<$text text=<<title>>/>
20+
<$link to="""$title$""">
21+
<$text text="""$title$"""/>
2222
</$link>
23-
(<$transclude tiddler=<<title>> mode="inline">
24-
<$set name="currentTiddler" value=<<title>>><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
23+
&#32;(<$transclude tiddler="""$title$""" mode="inline">
24+
<$set name="currentTiddler" value="""$title$"""><$transclude tiddler="$:/language/MissingTiddler/Hint"/></$set>
2525
</$transclude>)
2626
</span>
27-
<%endif%>
27+
</$list>
2828
\end

0 commit comments

Comments
 (0)