diff --git a/core/language/en-GB/Search.multids b/core/language/en-GB/Search.multids index 5a3835560..78a253820 100644 --- a/core/language/en-GB/Search.multids +++ b/core/language/en-GB/Search.multids @@ -21,14 +21,16 @@ System/Matches: //<> matches// Variables/Caption: Variables Variables/Clear: Clear Variables/Exclude: Exclude: -Variables/Exclude/Hint: Filter -Variables/Exclude/Show: Show exclude input Variables/Exclude/Hide: Hide exclude input +Variables/Exclude/Hint: Filter eg: [prefix[.]] +Variables/Exclude/Save: Create / Save Exclude Filter +Variables/Exclude/Show: Show exclude input +Variables/Exclude/Description: EDIT ME - Description is shown in the dropdown Variables/Filter: Filter: -Variables/Filter/Hint: Text +Variables/Filter/Hint: Text eg: .attr Variables/Hint: Filter global variables Variables/Matches: //<> matches// Variables/Search: Search Variables Variables/Search/Details: Search tiddler text, tags: Variables/Option/Type: Type: -Variables/Option/Sort: Sort: +Variables/Option/Sort: Sort: \ No newline at end of file diff --git a/core/language/en-GB/Snippets/variables-prefix-dot.tid b/core/language/en-GB/Snippets/variables-prefix-dot.tid new file mode 100644 index 000000000..7681bf182 --- /dev/null +++ b/core/language/en-GB/Snippets/variables-prefix-dot.tid @@ -0,0 +1,5 @@ +description: [prefix[.]] Documentation variables prefixed with a dot +tags: $:/tags/Variables/Exclude/Snippet +title: $:/variables/exclude/prefix-dot + +[prefix[.]] \ No newline at end of file diff --git a/core/wiki/macros/dumpvariables.tid b/core/wiki/macros/dumpvariables.tid index 3e2acbf85..04e51eebf 100644 --- a/core/wiki/macros/dumpvariables.tid +++ b/core/wiki/macros/dumpvariables.tid @@ -12,11 +12,9 @@ tags: $:/tags/Global \define DV-FILTER-STR() [variables<_tf.dv-type>] \define DV-TMP-SEARCH() $:/temp/varSearch -\define DV-TMP-EXCLUDE() $:/temp/varExclude \define DV-TMP-SEARCH-DETAILS() $:/temp/varSearch/details \define DV-SEARCH-STATE() $:/state/varSearch - -\define DV-TMP-EXCLUDE-SUBFILTER() [[]] +\define DV-TMP-EXCLUDE() $:/state/varExclude \function tf.dv-filterString() [<_tf.dv-sort>match[raw]thenelse] \function tf.dv-formattedVar() [format:variable<_tf.dv-varFormat>] @@ -139,7 +137,6 @@ tags: $:/tags/Global \function tf.dv-getSearchText() [get[text]] \function tf.dv-excludeText() [] [] +[join[/]] -\function tf.dv-getExcludeText() [get[text]else] \function tf.dv-getExcludeText() [get[text]] \function tf.dv-detailsSearch() [] [] [] +[join[/]] @@ -177,7 +174,11 @@ tags: $:/tags/Global <% endif %>
<$text text={{$:/language/Search/Variables/Exclude}}/> - <$edit-text tiddler=<> tag=input class="tc-tiny-gap-left" placeholder={{$:/language/Search/Variables/Exclude/Hint}}/> <> + <$edit-text tiddler=<> tag=input class="tc-tiny-gap" placeholder={{$:/language/Search/Variables/Exclude/Hint}}/> + <> + <% if [!is[blank]] %> + <> + <% endif %> <$list filter="[subfilter] +[search::some] +[filter] +[!filter]" variable="varname">
@@ -218,3 +219,67 @@ tags: $:/tags/Global
\end + + + + +\procedure lc-actionsXX() +<$action-setfield $tiddler="$:/temp/advancedsearch" text=<>/> +<$action-setfield $tiddler="$:/temp/advancedsearch/input" text=<>/> +<$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/> +<$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/> +\end + +\procedure lc-actions() +<$action-setfield $tiddler=<> text=<>/> +\end + +\procedure addVariableFilter() +<$action-sendmessage + $message="tm-new-tiddler" + tags="$:/tags/Variables/Exclude/Snippet" + description={{$:/language/Search/Variables/Exclude/Description}} + text=<> +/> + +<$action-deletetiddler + $tiddler=<> +/> +\end + +\procedure addNewVariableFilter() +
+<$button tag="a" actions=<> class="tc-tiddlylink"> + + <$text text={{$:/language/Search/Variables/Exclude/Save}}/> + + +\end + +\procedure variablesMorePopup() + +<$button popup=<> class="tc-btn-invisible"> +{{$:/core/images/down-arrow}} + + + +<$reveal state=<> type="popup" position="belowleft"> + <$let name="tv-show-missing-links" value="yes"> + <$linkcatcher actions=<> > +
+
+ <$macrocall $name="list-tagged-draggable" + tag="$:/tags/Variables/Exclude/Snippet" + subFilter="!is[draft]" + itemTemplate="$:/core/ui/AdvancedSearch/Variables/ItemTemplate" + /> + + + + <> +
+
+ + + +\end \ No newline at end of file