From 4a9cf67a25196ba892717665b080c7428d3f92b7 Mon Sep 17 00:00:00 2001 From: Cameron Fischer Date: Fri, 1 Apr 2022 07:09:30 -0400 Subject: [PATCH] Trim Saga: whitespace trimming three big tiddlers (#6265) * whitespace trimming three big tiddlers * Forgot one macro * This emptyMessage needed trimming too * Switching to more consistent emptyMessage quotes --- core/ui/ControlPanel/Modals/AddPlugins.tid | 35 ++++++++++++++++------ core/ui/ImportListing.tid | 28 +++++++++++++---- core/ui/Manager.tid | 17 +++++++---- 3 files changed, 60 insertions(+), 20 deletions(-) diff --git a/core/ui/ControlPanel/Modals/AddPlugins.tid b/core/ui/ControlPanel/Modals/AddPlugins.tid index ead756408..ce8612b72 100644 --- a/core/ui/ControlPanel/Modals/AddPlugins.tid +++ b/core/ui/ControlPanel/Modals/AddPlugins.tid @@ -2,6 +2,7 @@ title: $:/core/ui/ControlPanel/Modals/AddPlugins subtitle: {{$:/core/images/download-button}} {{$:/language/ControlPanel/Plugins/Add/Caption}} \define install-plugin-actions() +\whitespace trim <$action-sendmessage $message="tm-load-plugin-from-library" url={{!!url}} title={{$(assetInfo)$!!original-title}}/> <$set name="url" value={{!!url}}> <$set name="currentTiddler" value=<>> @@ -13,18 +14,21 @@ subtitle: {{$:/core/images/download-button}} {{$:/language/ControlPanel/Plugins/ \end \define install-plugin-button() +\whitespace trim
<$set name="libraryVersion" value={{{ [get[version]] }}}> <$set name="installedVersion" value={{{ [get[original-title]get[version]] }}}> <$set name="reinstall-type" value={{{ [compare:version:eqthen[tc-reinstall]] [compare:version:gtthen[tc-reinstall-upgrade]] [compare:version:ltthen[tc-reinstall-downgrade]] }}}> <$button actions=<> class={{{ [get[original-title]has[version]then] tc-btn-invisible tc-install-plugin +[join[ ]] }}}> {{$:/core/images/download-button}} + <$list filter="[get[original-title]get[version]]" variable="ignore" emptyMessage="{{$:/language/ControlPanel/Plugins/Install/Caption}}"> -<$list filter="[compare:version:gt]" variable="ignore" emptyMessage=""" -<$list filter="[compare:version:lt]" variable="ignore" emptyMessage="{{$:/language/ControlPanel/Plugins/Reinstall/Caption}}"> +<$list filter="[compare:version:gt]" variable="ignore" emptyMessage=" +\whitespace trim +<$list filter='[compare:version:lt]' variable='ignore' emptyMessage='{{$:/language/ControlPanel/Plugins/Reinstall/Caption}}'> {{$:/language/ControlPanel/Plugins/Downgrade/Caption}} -"""> +"> {{$:/language/ControlPanel/Plugins/Update/Caption}} @@ -43,6 +47,7 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$ \end \define display-plugin-info(type) +\whitespace trim <$set name="popup-state" value=<>>
@@ -63,7 +68,9 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
-

<$text text={{{ [get[name]] ~[get[original-title]split[/]last[1]] }}}/>: <$view tiddler=<> field="description"/>

+

<$text text={{{ [get[name]] ~[get[original-title]split[/]last[1]] }}}/>: + +<$view tiddler=<> field="description"/>

<$view tiddler=<> field="original-title"/>

<$view tiddler=<> field="version"/>
<$list filter="[get[original-title]get[version]]" variable="installedVersion">
{{$:/language/ControlPanel/Plugins/AlreadyInstalled/Hint}}
@@ -83,9 +90,9 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$ <$set name="currentTiddler" value=<>> <$list filter="[enlist{!!dependents}] [get[parent-plugin]] +[limit[1]]" variable="ignore">
-{{$:/language/ControlPanel/Plugins/AlsoRequires}} +{{$:/language/ControlPanel/Plugins/AlsoRequires}} <$list filter="[enlist{!!dependents}] [{!!parent-plugin}] +[sort[name]]" variable="dependency"> -<$text text=<>/> +<$text text=<>/>
@@ -118,16 +125,21 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$ \end \define load-plugin-library-button() +\whitespace trim <$list filter="[get[enabled]else[yes]match[yes]]" variable="ignore"> <$button class="tc-btn-big-green"> <$action-sendmessage $message="tm-load-plugin-library" url={{!!url}} infoTitlePrefix="$:/temp/RemoteAssetInfo/"/> -{{$:/core/images/chevron-right}} {{$:/language/ControlPanel/Plugins/OpenPluginLibrary}} +{{$:/core/images/chevron-right}} {{$:/language/ControlPanel/Plugins/OpenPluginLibrary}} \end \define display-server-assets(type) -{{$:/language/Search/Search}}: <$edit-text tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" default="" type="search" tag="input"/> +\whitespace trim +{{$:/language/Search/Search}}: + +<$edit-text tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" default="" type="search" tag="input"/> + <$reveal state="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" type="nomatch" text=""> <$button class="tc-btn-invisible"> <$action-setfield $tiddler="""$:/temp/RemoteAssetSearch/$(currentTiddler)$""" $field="text" $value=""/> @@ -144,6 +156,7 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$ \end \define display-server-connection() +\whitespace trim <$list filter="[all[tiddlers+shadows]tag[$:/tags/ServerConnection]suffix{!!url}]" variable="connectionTiddler" emptyMessage=<>> <$set name="transclusion" value=<>> @@ -156,16 +169,18 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$ \end \define close-library-button() +\whitespace trim <$reveal type='nomatch' state='$:/temp/ServerConnection/$(PluginLibraryURL)$' text=''> <$button class='tc-btn-big-green'> <$action-sendmessage $message="tm-unload-plugin-library" url={{!!url}}/> -{{$:/core/images/chevron-left}} {{$:/language/ControlPanel/Plugins/ClosePluginLibrary}} +{{$:/core/images/chevron-left}} {{$:/language/ControlPanel/Plugins/ClosePluginLibrary}} <$action-deletetiddler $filter="[prefix[$:/temp/ServerConnection/$(PluginLibraryURL)$]][prefix[$:/temp/RemoteAssetInfo/$(PluginLibraryURL)$]]"/> \end \define plugin-library-listing() +\whitespace trim
<$set name="defaultTab" value={{{ [all[tiddlers+shadows]tag[$:/tags/PluginLibrary]] }}}>
@@ -187,6 +202,7 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$ <$set name=PluginLibraryURL value={{!!url}}> <> + <> @@ -196,6 +212,7 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$ \end \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\whitespace trim
<> diff --git a/core/ui/ImportListing.tid b/core/ui/ImportListing.tid index c53be5b18..5100eb831 100644 --- a/core/ui/ImportListing.tid +++ b/core/ui/ImportListing.tid @@ -7,6 +7,7 @@ title: $:/core/ui/ImportListing \define payloadTitleFilter() [getminlength[1]else] \define overWriteWarning() +\whitespace trim <$list filter="[!has]"> <$text text={{{[subfilter!is[tiddler]then[]] ~[addsuffix[Listing/Rename/OverwriteWarning]get[text]]}}}/> @@ -43,16 +44,19 @@ title: $:/core/ui/ImportListing \define renameFieldState() $(currentTiddler)$!!state-rename-$(payloadTiddler)$ \define select-all-actions() +\whitespace trim <$list filter="[all[current]plugintiddlers[]sort[title]]" variable="payloadTiddler"> <$action-setfield $field={{{ [addprefix[selection-]] }}} $value={{$:/state/import/select-all}}/> \end +\whitespace trim @@ -88,16 +92,30 @@ title: $:/core/ui/ImportListing <$reveal type="match" state=<> text="yes" tag="tr"> - +
<$checkbox tiddler="$:/state/import/select-all" field="text" checked="checked" unchecked="unchecked" default="checked" actions=<>> + <> <> + <> + <>
-
-<$edit-text tiddler=<> default={{{[subfilter]}}} tag="input" class="tc-import-rename tc-flex-grow-1"/><$button class="tc-btn-invisible" set=<> setTo="no" tooltip={{{[addsuffix[Listing/Rename/CancelRename]get[text]]}}}>{{$:/core/images/close-button}}<$action-deletetiddler $tiddler=<>/><$button class="tc-btn-invisible" set=<> setTo="no" tooltip={{{[addsuffix[Listing/Rename/ConfirmRename]get[text]]}}}>{{$:/core/images/done-button}}<$action-setfield $field=<> $value={{{[get[text]minlength[1]else]}}} /><$action-deletetiddler $tiddler=<>/> -
-		 +
+ <$edit-text tiddler=<> default={{{[subfilter]}}} tag="input" class="tc-import-rename tc-flex-grow-1"/> + + <$button class="tc-btn-invisible" set=<> setTo="no" tooltip={{{[addsuffix[Listing/Rename/CancelRename]get[text]]}}}> + {{$:/core/images/close-button}} + <$action-deletetiddler $tiddler=<>/> + + + + <$button class="tc-btn-invisible" set=<> setTo="no" tooltip={{{[addsuffix[Listing/Rename/ConfirmRename]get[text]]}}}> + {{$:/core/images/done-button}} + <$action-setfield $field=<> $value={{{[get[text]minlength[1]else]}}} /> + <$action-deletetiddler $tiddler=<>/> + +
+
diff --git a/core/ui/Manager.tid b/core/ui/Manager.tid index b0a08ee64..2ef9ad8f3 100644 --- a/core/ui/Manager.tid +++ b/core/ui/Manager.tid @@ -5,16 +5,17 @@ color: #bbb \define lingo-base() $:/language/Manager/ \define list-item-content-item() +\whitespace trim
<$vars state-title="""$:/state/popup/manager/item/$(listItem)$"""> <$reveal state=<> type="match" text="show" default="show" tag="div"> <$button set=<> setTo="hide" class="tc-btn-invisible tc-manager-list-item-content-item-heading"> - {{$:/core/images/down-arrow}} <$transclude tiddler=<> field="caption"/> + {{$:/core/images/down-arrow}} <$transclude tiddler=<> field="caption"/> <$reveal state=<> type="nomatch" text="show" default="show" tag="div"> <$button set=<> setTo="show" class="tc-btn-invisible tc-manager-list-item-content-item-heading"> - {{$:/core/images/right-arrow}} <$transclude tiddler=<> field="caption"/> + {{$:/core/images/right-arrow}} <$transclude tiddler=<> field="caption"/> <$reveal state=<> type="match" text="show" default="show" tag="div" class="tc-manager-list-item-content-item-body"> @@ -24,19 +25,20 @@ color: #bbb
\end +\whitespace trim
- <> <$select tiddler="$:/config/Manager/Show" default="tiddlers"> + <> <$select tiddler="$:/config/Manager/Show" default="tiddlers">
- <> <$edit-text tiddler="$:/config/Manager/Filter" tag="input" default="" placeholder={{$:/language/Manager/Controls/Search/Placeholder}}/> + <> <$edit-text tiddler="$:/config/Manager/Filter" tag="input" default="" placeholder={{$:/language/Manager/Controls/Search/Placeholder}}/>
- <> <$select tiddler="$:/config/Manager/Tag" default=""> + <> <$select tiddler="$:/config/Manager/Tag" default=""> <$list filter="[!is{$:/config/Manager/System}tags[]!is[system]sort[title]]" variable="tag"> @@ -44,7 +46,7 @@ color: #bbb
- <> <$select tiddler="$:/config/Manager/Sort" default="title"> + <> <$select tiddler="$:/config/Manager/Sort" default="title"> <$list filter="title modified modifier created creator created" variable="field"> @@ -56,12 +58,15 @@ color: #bbb + <$checkbox tiddler="$:/config/Manager/Order" field="text" checked="reverse" unchecked="forward" default="forward"> + <>
<$checkbox tiddler="$:/config/Manager/System" field="text" checked="" unchecked="system" default="system"> + {{$:/language/SystemTiddlers/Include/Prompt}}