kopia lustrzana https://github.com/miklobit/TiddlyWiki5
Another fix for the block vs inline handline
rodzic
c761bbe2ed
commit
c17844b815
|
@ -359,7 +359,7 @@ exports.parseTag = function(source,pos,options) {
|
||||||
pos = token.end;
|
pos = token.end;
|
||||||
// Check for a required line break
|
// Check for a required line break
|
||||||
if(options.requireLineBreak) {
|
if(options.requireLineBreak) {
|
||||||
token = this.parseTokenRegExp(source,pos,/(\r?\n)/g);
|
token = this.parseTokenRegExp(source,pos,/(\r?\n\r?\n)/g);
|
||||||
if(!token) {
|
if(!token) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,11 +11,17 @@ background-color:$(backgroundColor)$;
|
||||||
<div class="tw-edit-add-tag"><span class="tw-add-tag-name"><$edit-text tiddler="$:/temp/NewTagName" tag="input" default="" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} focusPopup=<<qualify "$:/state/tagsAutoComplete">> class="tw-edit-texteditor"/></span> <$button popup=<<qualify "$:/state/tagsAutoComplete">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <span class="tw-add-tag-button"><$button message="tw-add-tag" param={{$:/temp/NewTagName}} set="$:/temp/NewTagName" setTo="" class=""><<lingo Tags/Add/Button>></$button></span></div>
|
<div class="tw-edit-add-tag"><span class="tw-add-tag-name"><$edit-text tiddler="$:/temp/NewTagName" tag="input" default="" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}} focusPopup=<<qualify "$:/state/tagsAutoComplete">> class="tw-edit-texteditor"/></span> <$button popup=<<qualify "$:/state/tagsAutoComplete">> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}</$button> <span class="tw-add-tag-button"><$button message="tw-add-tag" param={{$:/temp/NewTagName}} set="$:/temp/NewTagName" setTo="" class=""><<lingo Tags/Add/Button>></$button></span></div>
|
||||||
|
|
||||||
<div class="tw-block-dropdown-wrapper">
|
<div class="tw-block-dropdown-wrapper">
|
||||||
|
|
||||||
<$reveal state=<<qualify "$:/state/tagsAutoComplete">> type="nomatch" text="" default="">
|
<$reveal state=<<qualify "$:/state/tagsAutoComplete">> type="nomatch" text="" default="">
|
||||||
|
|
||||||
<div class="tw-block-dropdown">
|
<div class="tw-block-dropdown">
|
||||||
<$linkcatcher set="$:/temp/NewTagName" setTo="" message="tw-add-tag"><$list filter="[!is[shadow]tags[]search{$:/temp/NewTagName}sort[title]]"><$link><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label"><$view field="title" format="text"/></span></$set></$link>
|
|
||||||
|
<$linkcatcher set="$:/temp/NewTagName" setTo="" message="tw-add-tag">
|
||||||
|
<$list filter="[!is[shadow]tags[]search{$:/temp/NewTagName}sort[title]]">
|
||||||
|
<$link><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tw-tag-label"><$view field="title" format="text"/></span></$set></$link>
|
||||||
</$list>
|
</$list>
|
||||||
</$linkcatcher>
|
</$linkcatcher>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</$reveal>
|
</$reveal>
|
||||||
|
|
|
@ -17,6 +17,7 @@ title: $:/core/ui/PageMacros
|
||||||
<$reveal type="match" state=<<qualify "$state$">> text=<<currentTab>> default="$default$">
|
<$reveal type="match" state=<<qualify "$state$">> text=<<currentTab>> default="$default$">
|
||||||
|
|
||||||
<$transclude tiddler=<<currentTab>>/>
|
<$transclude tiddler=<<currentTab>>/>
|
||||||
|
|
||||||
</$reveal>
|
</$reveal>
|
||||||
</$list>
|
</$list>
|
||||||
</div>
|
</div>
|
||||||
|
|
Ładowanie…
Reference in New Issue