mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-24 22:33:16 +00:00
Code Issues Releases Wiki Activity

Revert "Fix: make tag-picker "add-tag" button more consistent (#4199)" (#4311)

Browse Source 
This reverts commit 74172b35ce.
This commit is contained in:
Simon Huber 2019-10-13 11:19:44 +02:00 committed by Jeremy Ruston
parent f0779b58ac
commit 4cf96e7339
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/ui/EditTemplate/tags.tid
View File

@ -25,6 +25,14 @@ color:$(foregroundColor)$;
<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}} icon="""$icon$"""/> <$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}} icon="""$icon$"""/>
\end \end
\define tag-picker-actions()
<$action-listops
$tiddler=<<currentTiddler>>
$field="tags"
$subfilter="[<tag>] [all[current]tags[]]"
/>
\end
<div class="tc-edit-tags"> <div class="tc-edit-tags">
<$fieldmangler> <$fieldmangler>
<$list filter="[all[current]tags[]sort[title]]" storyview="pop"> <$list filter="[all[current]tags[]sort[title]]" storyview="pop">
@ -32,6 +40,6 @@ color:$(foregroundColor)$;
</$list> </$list>
</$fieldmangler> </$fieldmangler>
<$set name="tabIndex" value={{$:/config/EditTabIndex}}> <$set name="tabIndex" value={{$:/config/EditTabIndex}}>
<$macrocall $name="tag-picker"/> <$macrocall $name="tag-picker" actions=<<tag-picker-actions>>/>
</$set> </$set>
</div> </div>

6
core/wiki/macros/tag-picker.tid
View File

@ -14,7 +14,8 @@ $(actions)$
</$button> </$button>
\end \end
\define tag-picker() \define tag-picker(actions)
<$set name="actions" value="""$actions$""">
<div class="tc-edit-add-tag"> <div class="tc-edit-add-tag">
<span class="tc-add-tag-name"> <span class="tc-add-tag-name">
<$keyboard key="ENTER" actions=<<add-tag-actions>>> <$keyboard key="ENTER" actions=<<add-tag-actions>>>
@ -23,7 +24,7 @@ $(actions)$
</span> <$button popup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-btn-invisible" tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button> <span class="tc-add-tag-button"> </span> <$button popup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-btn-invisible" tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button> <span class="tc-add-tag-button">
<$set name="tag" value={{$:/temp/NewTagName}}> <$set name="tag" value={{$:/temp/NewTagName}}>
<$button set="$:/temp/NewTagName" setTo="" class=""> <$button set="$:/temp/NewTagName" setTo="" class="">
<<add-tag-actions>> $actions$
<$action-deletetiddler $tiddler="$:/temp/NewTagName"/> <$action-deletetiddler $tiddler="$:/temp/NewTagName"/>
{{$:/language/EditTemplate/Tags/Add/Button}} {{$:/language/EditTemplate/Tags/Add/Button}}
</$button> </$button>
@ -45,4 +46,5 @@ $(actions)$
</div> </div>
</$reveal> </$reveal>
</div> </div>
</$set>
\end \end