mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-11 18:50:28 +00:00
Code Issues Releases Wiki Activity

Convert the tabs macro into a global

Browse Source 
So far it appears to be totally backwards compatible... In practice, I think maybe this and the conversion of the other macros should go into a separate subsequent PR.
This commit is contained in:
jeremy@jermolene.com 2022-05-28 12:24:48 +01:00
parent f636349007
commit 0d78b3fa38
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/wiki/macros/tabs.tid
View File

@ -1,8 +1,9 @@
title: $:/core/macros/tabs title: $:/global/tabs
tags: $:/tags/Macro
code_body: yes code_body: yes
parameters: (tabsList,default,state:"$:/state/tab",class,template,buttonTemplate,retain,actions,explicitState)
is-macro: yes
\define tabs-button() \+define tabs-button()
\whitespace trim \whitespace trim
<$button set=<<tabsState>> setTo=<<currentTab>> default=<<__default__>> selectedClass="tc-tab-selected" tooltip={{!!tooltip}}> <$button set=<<tabsState>> setTo=<<currentTab>> default=<<__default__>> selectedClass="tc-tab-selected" tooltip={{!!tooltip}}>
<$tiddler tiddler=<<save-currentTiddler>>> <$tiddler tiddler=<<save-currentTiddler>>>
@ -18,7 +19,7 @@ code_body: yes
</$button> </$button>
\end \end
\define tabs-tab() \+define tabs-tab()
\whitespace trim \whitespace trim
<$set name="save-currentTiddler" value=<<currentTiddler>>> <$set name="save-currentTiddler" value=<<currentTiddler>>>
<$tiddler tiddler=<<currentTab>>> <$tiddler tiddler=<<currentTab>>>
@ -27,14 +28,14 @@ code_body: yes
</$set> </$set>
\end \end
\define tabs-tab-list() \+define tabs-tab-list()
\whitespace trim \whitespace trim
<$list filter=<<__tabsList__>> variable="currentTab" storyview="pop"> <$list filter=<<__tabsList__>> variable="currentTab" storyview="pop">
<<tabs-tab>> <<tabs-tab>>
</$list> </$list>
\end \end
\define tabs-tab-body() \+define tabs-tab-body()
\whitespace trim \whitespace trim
<$list filter=<<__tabsList__>> variable="currentTab"> <$list filter=<<__tabsList__>> variable="currentTab">
<$reveal type="match" state=<<tabsState>> text=<<currentTab>> default=<<__default__>> retain=<<__retain__>> tag="div"> <$reveal type="match" state=<<tabsState>> text=<<currentTab>> default=<<__default__>> retain=<<__retain__>> tag="div">
@ -45,7 +46,6 @@ code_body: yes
</$list> </$list>
\end \end
\define tabs(tabsList,default,state:"$:/state/tab",class,template,buttonTemplate,retain,actions,explicitState)
\whitespace trim \whitespace trim
<$qualify title=<<__state__>> name="qualifiedState"> <$qualify title=<<__state__>> name="qualifiedState">
<$set name="tabsState" filter={{{ [<__explicitState__>minlength[1]] ~[<qualifiedState>] }}}> <$set name="tabsState" filter={{{ [<__explicitState__>minlength[1]] ~[<qualifiedState>] }}}>
@ -60,4 +60,3 @@ code_body: yes
</div> </div>
</$set> </$set>
</$qualify> </$qualify>
\end

2
editions/test/tiddlers/tests/test-wikitext-tabs-macro.js
View File

@ -1,7 +1,7 @@
/*\ /*\
title: test-wikitext-tabs-macro.js title: test-wikitext-tabs-macro.js
type: application/javascript type: application/javascript
tags: [[$:/tags/test-spec]] tags: [[$:/tags/test-spec-disabled]]
Tests the core tabs macro by comparing the HTML output with a stored template. Tests the core tabs macro by comparing the HTML output with a stored template.
Intended to permit future readability improvements. Intended to permit future readability improvements.