diff --git a/core/wiki/macros/search-variables.tid b/core/wiki/macros/search-variables.tid index d1bb13d4e..c1c10943c 100644 --- a/core/wiki/macros/search-variables.tid +++ b/core/wiki/macros/search-variables.tid @@ -11,8 +11,8 @@ tags: $:/tags/Global \procedure DV-SORT-OPTIONS() $:/temp/varSearch/sort -\procedure DV-RAW-FILTER-STR() [variables:raw<_tf.dv-type>] -\procedure DV-FILTER-STR() [variables<_tf.dv-type>] +\procedure DV-RAW-FILTER-STR() [variables:raw<_wlf.dv-type>] +\procedure DV-FILTER-STR() [variables<_wlf.dv-type>] \procedure DV-FOLDED() $:/temp/varFolded @@ -25,10 +25,10 @@ tags: $:/tags/Global \procedure DV-TYPE-CONFIG() $:/config/DumpVariables/type-selector -\function tf.dv-filterString() [<_tf.dv-sort>match[raw]thenelse] -\function tf.dv-formattedVar() [format:variable<_tf.dv-varFormatStr>] +\function wlf.dv-filterString() [<_wlf.dv-sort>match[raw]thenelse] +\function wlf.dv-formattedVar() [format:variable<_wlf.dv-varFormatStr>] -\function tf.dv-foldedState() [] [] +[join[/]] +\function wlf.dv-foldedState() [] [] +[join[/]] @@ -36,12 +36,12 @@ tags: $:/tags/Global \procedure wl-dumpvariables(type sort subfilter:"[[]]" format) - \function _tf.dv-varFormatStr() [!is[blank]thenelse[$type$ $name$($params$)]] - \function _tf.dv-type() [] - \function _tf.dv-sort() [] + \function _wlf.dv-varFormatStr() [!is[blank]thenelse[$type$ $name$($params$)]] + \function _wlf.dv-type() [] + \function _wlf.dv-sort() []

- <$text text=`${ [subfilter] + <$text text=`${ [subfilter] +[filter] +[count[]] }$` /> @@ -52,10 +52,10 @@ tags: $:/tags/Global

    - <$list filter="[subfilter] +[filter]" variable="varname"> + <$list filter="[subfilter] +[filter]" variable="varname">
  • - <$text text=<>/>
    - <% if [prefix[\function]] %> + <$text text=<>/>
    + <% if [prefix[\function]] %> 
    <$text text={{{ [jsonvariable[]jsonextract[srcVariable],[value]] }}}/>
    <% endif %> 
    <$text text={{{ [getvariable[]] }}}/>
    @@ -66,25 +66,25 @@ tags: $:/tags/Global \procedure dv-toggleState() -<$action-setfield $tiddler=<> text={{{ [get[text]] +[toggle[yes],[no]] }}}/> +<$action-setfield $tiddler=<> text={{{ [get[text]] +[toggle[yes],[no]] }}}/> <> \end \procedure dv-toggleInfoState() -<$action-setfield $tiddler=<> - text={{{ [get[text]] +[toggle[yes],[no]] }}} +<$action-setfield $tiddler=<> + text={{{ [get[text]] +[toggle[yes],[no]] }}} /> -<$action-setfield $tiddler=<> - text={{{ [!is[blank]then] :else[format:variable[$type$ $name$]] }}} +<$action-setfield $tiddler=<> + text={{{ [!is[blank]then] :else[format:variable[$type$ $name$]] }}} /> \end \procedure dv-setDetailsSearchText() -<$action-setfield $tiddler=<> +<$action-setfield $tiddler=<> text={{{ [format:variable[$type$ $name$]] }}} /> \end @@ -100,7 +100,7 @@ tags: $:/tags/Global \procedure dv-clearSearchButton() <$button class="tc-btn-invisible btn-x" tooltip={{$:/language/Search/Variables/Clear/Search}}> - <$action-deletetiddler $tiddler=<>/> + <$action-deletetiddler $tiddler=<>/> <$action-sendmessage $message="tm-focus-selector" $param="input.x-inp"/> {{$:/core/images/close-button}} @@ -108,7 +108,7 @@ tags: $:/tags/Global \procedure dv-clearExcludeButton() <$button class="tc-btn-invisible btn-yy" tooltip={{$:/language/Search/Variables/Clear/Exclude}}> - <$action-deletetiddler $tiddler=<>/> + <$action-deletetiddler $tiddler=<>/> <$action-sendmessage $message="tm-focus-selector" $param="input.y-inp"/> {{$:/core/images/close-button}} @@ -118,13 +118,13 @@ tags: $:/tags/Global <> <$button class="tc-btn-invisible" tooltip={{$:/language/Search/Variables/ExpandAll}}> <$action-setfield $tiddler=<> - text={{{ [get[text]] +[toggle[yes],[no]] }}} + text={{{ [get[text]] +[toggle[yes],[no]] }}} /> - <$list filter="[subfilter] +[search::some] +[filter]" + <$list filter="[subfilter] +[search::some] +[filter]" variable="varname" > - <$action-setfield $tiddler=<> text="yes"/> + <$action-setfield $tiddler=<> text="yes"/> {{$:/core/images/unfold-all-button}} @@ -132,7 +132,7 @@ tags: $:/tags/Global \procedure dv-info()
    - <$list filter="[all[tiddlers+shadows]] :filter[search:text,tags:words] + <$list filter="[all[tiddlers+shadows]] :filter[search:text,tags:words] -[[$:/config/OriginalTiddlerPaths]] -[[$:/HistoryList]] -[[$:/StoryList]] @@ -147,20 +147,20 @@ tags: $:/tags/Global
    \end -\function tf.dv-tmpTypeOptions() [] [] +[join[/]] -\function tf.dv-tmpSortOptions() [] [] +[join[/]] +\function wlf.dv-tmpTypeOptions() [] [] +[join[/]] +\function wlf.dv-tmpSortOptions() [] [] +[join[/]] -\function tf.dv-searchText() [] [] +[join[/]] -\function tf.dv-getSearchText() [get[text]] +\function wlf.dv-searchText() [] [] +[join[/]] +\function wlf.dv-getSearchText() [get[text]] -\function tf.dv-excludeText() [] [] +[join[/]] -\function tf.dv-getExcludeText() [get[text]] +\function wlf.dv-excludeText() [] [] +[join[/]] +\function wlf.dv-getExcludeText() [get[text]] -\function tf.dv-detailsSearch() [] [] [] +[join[/]] -\function tf.dv-getDetailsSearchText() [get[text]] +\function wlf.dv-detailsSearch() [] [] [] +[join[/]] +\function wlf.dv-getDetailsSearchText() [get[text]] -\function tf.dv-varState() [] [] [] +[join[/]] -\function tf.dv-toggleInfoState() [] [] +[join[/]] +\function wlf.dv-varState() [] [] [] +[join[/]] +\function wlf.dv-toggleInfoState() [] [] +[join[/]] @@ -168,17 +168,17 @@ tags: $:/tags/Global \procedure search-variables(type sort subfilter:"[[]]" format) - \function _tf.dv-varFormatStr() [!is[blank]thenelse[$type$ $name$($params$)]] - \function _tf.dv-type() [!is[blank]then] :else[get[text]] - \function _tf.dv-sort() [!is[blank]then] :else[get[text]] :else[[alphabetical]] + \function _wlf.dv-varFormatStr() [!is[blank]thenelse[$type$ $name$($params$)]] + \function _wlf.dv-type() [!is[blank]then] :else[get[text]] + \function _wlf.dv-sort() [!is[blank]then] :else[get[text]] :else[[alphabetical]] <>

    - <$text text=`${ [subfilter] - +[search::some] + <$text text=`${ [subfilter] + +[search::some] +[filter] - +[!filter] + +[!filter] +[count[]] }$` /> <> @@ -188,43 +188,43 @@ tags: $:/tags/Global

    - <$list filter="[subfilter] - +[search::some] + <$list filter="[subfilter] + +[search::some] +[filter] - +[!filter]" + +[!filter]" variable="varname" >
    <$button actions=<> class="tc-small-gap-left tc-btn-invisible"> - <% if [get[text]match[yes]] %> + <% if [get[text]match[yes]] %> {{$:/core/images/down-arrow}} <% else %> {{$:/core/images/right-arrow}} <% endif %> - <$text text=<>/> + <$text text=<>/> - <% if [prefix[\function]] %> + <% if [prefix[\function]] %> <$text text={{{ [format:variable[$firstLine$]] }}}/> <% endif %> - <% if [get[text]match[yes]] %> + <% if [get[text]match[yes]] %> <$button actions=<> class="tc-btn-details tc-btn-invisible tc-small-gap-left" > - <% if [get[text]match[yes]] %> + <% if [get[text]match[yes]] %> {{$:/core/images/up-arrow}} <% else %> {{$:/core/images/advanced-search-button}} <% endif %>
    - <% if [get[text]match[yes]] %> + <% if [get[text]match[yes]] %>
    <> - <$edit-text tiddler=<> tag=input class="wltc-fluid-input tc-small-gap-left"/> + <$edit-text tiddler=<> tag=input class="wltc-fluid-input tc-small-gap-left"/> <$button actions=<> class="tc-btn-invisible tc-tiny-gap-left" tooltip={{$:/language/Search/Variables/Info/Reset}} @@ -252,7 +252,7 @@ tags: $:/tags/Global \procedure dv-search-input-box() <$text text={{$:/language/Search/Variables/Filter}}/> -<$edit-text tiddler=<> +<$edit-text tiddler=<> tag=input class="txt-input x-inp" placeholder={{$:/language/Search/Variables/Filter/Hint}} @@ -263,18 +263,18 @@ tags: $:/tags/Global \procedure dv-exclude-input-box() <$text text={{$:/language/Search/Variables/Exclude}}/> -<$edit-text tiddler=<> +<$edit-text tiddler=<> tag=input class="txt-input y-inp" placeholder={{$:/language/Search/Variables/Exclude/Hint}} /> <> -<% if [!is[blank]] %> +<% if [!is[blank]] %> <> <% endif %> \end -\function tf.dv-opt-class() "c" [