1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-27 03:57:21 +00:00

Fixes use of stateTitle instead of state resulting in artifacts during import (#4711)

* Fixes use of stateTitle instead of state

* Fixed bug with merging
This commit is contained in:
saqimtiaz 2020-06-13 10:16:33 +02:00 committed by GitHub
parent d832cb93ce
commit 38e329edad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,13 +41,13 @@ $(currentTiddler)$!!popup-$(payloadTiddler)$
<$checkbox field=<<selectionField>> checked="checked" unchecked="unchecked" default="checked"/> <$checkbox field=<<selectionField>> checked="checked" unchecked="unchecked" default="checked"/>
</td> </td>
<td> <td>
<$reveal type="nomatch" stateTitle=<<previewPopupState>> text="yes" tag="div"> <$reveal type="nomatch" state=<<previewPopupState>> text="yes" tag="div">
<$button class="tc-btn-invisible tc-btn-dropdown" setTitle=<<previewPopupState>> setTo="yes"> <$button class="tc-btn-invisible tc-btn-dropdown" set=<<previewPopupState>> setTo="yes">
{{$:/core/images/right-arrow}}&nbsp;<$text text=<<payloadTiddler>>/> {{$:/core/images/right-arrow}}&nbsp;<$text text=<<payloadTiddler>>/>
</$button> </$button>
</$reveal> </$reveal>
<$reveal type="match" stateTitle=<<previewPopupState>> text="yes" tag="div"> <$reveal type="match" state=<<previewPopupState>> text="yes" tag="div">
<$button class="tc-btn-invisible tc-btn-dropdown" setTitle=<<previewPopupState>> setTo="no"> <$button class="tc-btn-invisible tc-btn-dropdown" set=<<previewPopupState>> setTo="no">
{{$:/core/images/down-arrow}}&nbsp;<$text text=<<payloadTiddler>>/> {{$:/core/images/down-arrow}}&nbsp;<$text text=<<payloadTiddler>>/>
</$button> </$button>
</$reveal> </$reveal>
@ -58,7 +58,7 @@ $(currentTiddler)$!!popup-$(payloadTiddler)$
</tr> </tr>
<tr> <tr>
<td colspan="3"> <td colspan="3">
<$reveal type="match" text="yes" stateTitle=<<previewPopupState>> tag="div"> <$reveal type="match" text="yes" state=<<previewPopupState>> tag="div">
<$list filter="[{$:/state/importpreviewtype}has[text]]" variable="listItem" emptyMessage={{$:/core/ui/ImportPreviews/Text}}> <$list filter="[{$:/state/importpreviewtype}has[text]]" variable="listItem" emptyMessage={{$:/core/ui/ImportPreviews/Text}}>
<$transclude tiddler={{$:/state/importpreviewtype}}/> <$transclude tiddler={{$:/state/importpreviewtype}}/>
</$list> </$list>