From 317104774c496a04783bdb824d9ef76e50eeb7ed Mon Sep 17 00:00:00 2001 From: Mario Pietsch Date: Wed, 29 Oct 2025 12:17:02 +0100 Subject: [PATCH] list-links-draggable defaults to currentTiddler if tiddler parameter is missing (#9254) * list-links-draggable if tiddler parameter undefined default to currentTiddler * update list-links-draggable docs with the new behaviour --- core/wiki/macros/list.tid | 81 ++++++++++--------- .../macros/list-links-draggable Macro.tid | 21 +++-- 2 files changed, 57 insertions(+), 45 deletions(-) diff --git a/core/wiki/macros/list.tid b/core/wiki/macros/list.tid index c9dd2ad71d..d4b0b0a0cb 100644 --- a/core/wiki/macros/list.tid +++ b/core/wiki/macros/list.tid @@ -24,44 +24,49 @@ tags: $:/tags/Macro \define list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate) \whitespace trim - - <$vars targetTiddler="""$tiddler$""" targetField="""$field$"""> - <$genesis $type=<<__type__>> class="$class$"> - <$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>> - <$droppable - actions=<> - tag="""$subtype$""" - enable=<> - > -
-
- <$transclude tiddler="""$itemTemplate$"""> - <$link to={{!!title}}> - <$let tv-wikilinks="no"> - <$transclude field="caption"> - <$view field="title"/> - - - - -
- - - <$tiddler tiddler=""> - <$droppable - actions=<> - tag="div" - enable=<> - > -
- {{$:/core/images/blank}} -
-
- - - - - +<$set name="_tiddler" value="""$tiddler$""" emptyValue=<> > + <$let field-reference={{{ [<_tiddler>] "!!" [[$field$]] +[join[]] }}} + targetTiddler=<<_tiddler>> + targetField="""$field$""" + > + + <$genesis $type=<<__type__>> class="$class$"> + <$list filter="[list]" emptyMessage=<<__emptyMessage__>>> + <$droppable + actions=<> + tag="""$subtype$""" + enable=<> + > +
+
+ <$transclude tiddler="""$itemTemplate$"""> + <$link to={{!!title}}> + <$let tv-wikilinks="no"> + <$transclude field="caption"> + <$view field="title"/> + + + + +
+ + + <$tiddler tiddler=""> + <$droppable + actions=<> + tag="div" + enable=<> + > +
+ {{$:/core/images/blank}} +
+
+ + + + + + \end \define list-tagged-draggable-drop-actions(tag) diff --git a/editions/tw5.com/tiddlers/macros/list-links-draggable Macro.tid b/editions/tw5.com/tiddlers/macros/list-links-draggable Macro.tid index b817acf629..cd4252d072 100644 --- a/editions/tw5.com/tiddlers/macros/list-links-draggable Macro.tid +++ b/editions/tw5.com/tiddlers/macros/list-links-draggable Macro.tid @@ -9,19 +9,26 @@ The <<.def list-links-draggable>> [[macro|Macros]] renders the ListField of a ti !! Parameters -;tiddler +; tiddler : The title of the tiddler containing the list -;field +: <<.from-version 5.4.0>> If the tiddler parameter is not defined it defaults to: <<.var currentTiddler>> + +; field : The name of the field containing the list (defaults to `list`) -;emptyMessage + +; emptyMessage : Optional wikitext to display if there is no output (tiddler is not existed, field is not existed or empty) -;type + +; type : The element tag to use for the list wrapper (defaults to `ul`) -;subtype + +; subtype : The element tag to use for the list items (defaults to `li`) -;class + +; class : Optional space separated classes to add to the wrapper element -;itemTemplate + +; itemTemplate : Optional title of a tiddler to use as the template for rendering list items If the `itemTemplate` parameter is not provided then the list items are rendered as simple links. Within the `itemTemplate`, the [[currentTiddler Variable]] refers to the current list item.