mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-04 23:39:57 +00:00
Code Issues Releases Wiki Activity

remove itemClassFilter from macro-calls, but leaf them alone in the procedure definitions. So parameter order is kept intakt

Browse Source
This commit is contained in:
pmario 2024-02-06 18:47:33 +01:00
parent dbb27b55e9
commit 5510e226bb
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/wiki/macros/toc.tid
View File

@ -76,12 +76,13 @@ tags: $:/tags/Macro
</ol> </ol>
\end \end
<!-- ======================================= <!-- =============================================================
Simple toc macro which shows the full tree Simple toc macro which alwayse shows the full tree
This macro is _not_ used by other toc-macros This macro is _not_ used by other toc-macros
============================================ --> v5.3.4 itemClassFilter has been replaced by tf.toc-itemClassFilter
\procedure toc(tag, sort:"", itemClassFilter:"", exclude, viewField, viewFieldTemplate) ================================================================== -->
<$macrocall $name="toc-body" tag=<<tag>> sort=<<sort>> itemClassFilter=<<itemClassFilter>> exclude=<<exclude>>/> \procedure toc(tag, sort:"", itemClassFilter, exclude, viewField, viewFieldTemplate)
<$macrocall $name="toc-body" tag=<<tag>> sort=<<sort>> exclude=<<exclude>>/>
\end \end
<!-- <!--
@ -121,7 +122,7 @@ This macro is _not_ used by other toc-macros
<% if [<toc-state>get[text]match[open]] %> <% if [<toc-state>get[text]match[open]] %>
<$macrocall <$macrocall
$name="toc-expandable" $name="toc-expandable"
tag=<<currentTiddler>> sort=<<sort>> itemClassFilter=<<itemClassFilter>> exclude=<<exclude>> path=<<path>> tag=<<currentTiddler>> sort=<<sort>> exclude=<<exclude>> path=<<path>>
viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>> viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>>
/> />
<% endif %> <% endif %>
@ -137,7 +138,7 @@ This macro is _not_ used by other toc-macros
<% if [<toc-state>get[text]match[open]] %> <% if [<toc-state>get[text]match[open]] %>
<$macrocall <$macrocall
$name="toc-expandable" $name="toc-expandable"
tag=<<currentTiddler>> sort=<<sort>> itemClassFilter=<<itemClassFilter>> exclude=<<exclude>> path=<<path>> tag=<<currentTiddler>> sort=<<sort>> exclude=<<exclude>> path=<<path>>
viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>> viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>>
/> />
<% endif %> <% endif %>
@ -160,13 +161,13 @@ Shows an expandable toc. Item always have an open/close chevron
<% if [all[current]toc-link[no]] %> <% if [all[current]toc-link[no]] %>
<$macrocall <$macrocall
$name="toc-unlinked-expandable-body" $name="toc-unlinked-expandable-body"
tag=<<tag>> sort=<<sort>> itemClassFilter=<<itemClassFilter>> exclude=<<_excluded>> path=<<_path>> tag=<<tag>> sort=<<sort>> exclude=<<_excluded>> path=<<_path>>
viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>> viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>>
/> />
<% else %> <% else %>
<$macrocall <$macrocall
$name="toc-linked-expandable-body" $name="toc-linked-expandable-body"
tag=<<tag>> sort=<<sort>> itemClassFilter=<<itemClassFilter>> exclude=<<_excluded>> path=<<_path>> tag=<<tag>> sort=<<sort>> exclude=<<_excluded>> path=<<_path>>
viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>> viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>>
/> />
<% endif %> <% endif %>
@ -198,7 +199,7 @@ Shows an expandable toc. Item always have an open/close chevron
<% if [<toc-state>get[text]match[open]] %> <% if [<toc-state>get[text]match[open]] %>
<$macrocall <$macrocall
$name="toc-selective-expandable" $name="toc-selective-expandable"
tag=<<currentTiddler>> sort=<<sort>> itemClassFilter=<<itemClassFilter>> exclude=<<exclude>> path=<<path>> tag=<<currentTiddler>> sort=<<sort>> exclude=<<exclude>> path=<<path>>
viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>> viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>>
/> />
<% endif %> <% endif %>
@ -223,7 +224,7 @@ Shows an expandable toc. Item always have an open/close chevron
<% if [<toc-state>get[text]match[open]] %> <% if [<toc-state>get[text]match[open]] %>
<$macrocall <$macrocall
$name="toc-selective-expandable" $name="toc-selective-expandable"
tag=<<currentTiddler>> sort=<<sort>> itemClassFilter=<<itemClassFilter>> exclude=<<exclude>> path=<<path> tag=<<currentTiddler>> sort=<<sort>> exclude=<<exclude>> path=<<path>
viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>> viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>>
/> />
<% endif %> <% endif %>
@ -236,7 +237,6 @@ Shows a selctive expandable toc.
If an item has no children, there is no open/close chevron If an item has no children, there is no open/close chevron
========================================================== --> ========================================================== -->
\procedure toc-selective-expandable(tag,sort:"",itemClassFilter,exclude,path,viewField,viewFieldTemplate) \procedure toc-selective-expandable(tag,sort:"",itemClassFilter,exclude,path,viewField,viewFieldTemplate)
<ol class="tc-toc toc-selective-expandable"> <ol class="tc-toc toc-selective-expandable">
<!-- text substitution is needed for backwards compatibility --> <!-- text substitution is needed for backwards compatibility -->
<$list filter=` [subfilter<tf.toc-filter>] <$list filter=` [subfilter<tf.toc-filter>]
@ -248,13 +248,13 @@ If an item has no children, there is no open/close chevron
<% if [all[current]toc-link[no]] %> <% if [all[current]toc-link[no]] %>
<$macrocall <$macrocall
$name="toc-unlinked-selective-expandable-body" $name="toc-unlinked-selective-expandable-body"
tag=<<tag>> sort=<<sort>> itemClassFilter=<<itemClassFilter>> exclude=<<_excluded>> path=<<_path>> tag=<<tag>> sort=<<sort>> exclude=<<_excluded>> path=<<_path>>
viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>> viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>>
/> />
<% else %> <% else %>
<$macrocall <$macrocall
$name="toc-linked-selective-expandable-body" $name="toc-linked-selective-expandable-body"
tag=<<tag>> sort=<<sort>> itemClassFilter=<<itemClassFilter>> exclude=<<_excluded>> path=<<_path>> tag=<<tag>> sort=<<sort>> exclude=<<_excluded>> path=<<_path>>
viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>> viewField=<<viewField>> viewFieldTemplate=<<viewFieldTemplate>>
/> />
<% endif %> <% endif %>
@ -270,7 +270,6 @@ Shows a tabbed toc.
If a toc-item link is clicked it will open the tiddler in the story If a toc-item link is clicked it will open the tiddler in the story
=================================================================== --> =================================================================== -->
\procedure toc-tabbed-external-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"",exclude, viewField, viewFieldTemplate) \procedure toc-tabbed-external-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"",exclude, viewField, viewFieldTemplate)
<$tiddler tiddler={{{ [<selectedTiddler>get[text]] }}}> <$tiddler tiddler={{{ [<selectedTiddler>get[text]] }}}>
<div class="tc-tabbed-table-of-contents"> <div class="tc-tabbed-table-of-contents">
<$linkcatcher to=<<selectedTiddler>>> <$linkcatcher to=<<selectedTiddler>>>
@ -280,7 +279,6 @@ If a toc-item link is clicked it will open the tiddler in the story
$name="toc-selective-expandable" $name="toc-selective-expandable"
tag=<<tag>> tag=<<tag>>
sort=<<sort>> sort=<<sort>>
itemClassFilter="[all[current]] -[<selectedTiddler>get[text]]"
exclude=<<exclude>> exclude=<<exclude>>
viewField=<<viewField>> viewField=<<viewField>>
viewFieldTemplate=<<viewFieldTemplate>> viewFieldTemplate=<<viewFieldTemplate>>