From 9fbe72a8778ae94c7d6322ad4b9155c83f753113 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Fri, 18 Apr 2014 09:28:14 +0100 Subject: [PATCH] Rearrange system tag configuration By rearranging the `[all[]]` operator we are able to ensure that shadow tiddlers get processed before ordinary tiddlers. This makes it easier to create custom stylesheets that override the core. --- core/modules/filters/all.js | 2 +- core/ui/AdvancedSearch.tid | 2 +- core/ui/AdvancedSearch/Filter.tid | 2 +- core/ui/ControlPanel.tid | 2 +- core/ui/ControlPanel/Advanced.tid | 2 +- core/ui/ControlPanel/Appearance.tid | 2 +- core/ui/EditTemplate.tid | 2 +- core/ui/EditTemplate/controls.tid | 2 +- core/ui/EditTemplate/type.tid | 2 +- core/ui/Filters/SystemTags.tid | 2 +- core/ui/PageStylesheet.tid | 2 +- core/ui/PageTemplate.tid | 2 +- core/ui/PageTemplate/alerts.tid | 2 +- core/ui/PageTemplate/sidebar.tid | 2 +- core/ui/PageTemplate/topleftbar.tid | 2 +- core/ui/PageTemplate/toprightbar.tid | 2 +- core/ui/SideBar/More.tid | 2 +- core/ui/SideBarLists.tid | 2 +- core/ui/TagManager.tid | 2 +- core/ui/TiddlerInfo.tid | 2 +- core/ui/TiddlerInfo/Advanced.tid | 2 +- core/ui/ViewTemplate.tid | 2 +- core/ui/ViewTemplate/title.tid | 2 +- core/wiki/paletteswitcher.tid | 2 +- editions/tw5.com/tiddlers/Changes to filters in 5.0.9-beta.tid | 2 +- editions/tw5.com/tiddlers/concepts/SystemTags.tid | 2 +- editions/tw5.com/tiddlers/filters/FilterOperator tag.tid | 2 +- plugins/tiddlywiki/tiddlyweb/download-offline.tid | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/core/modules/filters/all.js b/core/modules/filters/all.js index f8601d057..12aab2b7b 100644 --- a/core/modules/filters/all.js +++ b/core/modules/filters/all.js @@ -5,7 +5,7 @@ module-type: filteroperator Filter operator for selecting tiddlers -[all[tiddlers+shadows]] +[all[shadows+tiddlers]] \*/ (function(){ diff --git a/core/ui/AdvancedSearch.tid b/core/ui/AdvancedSearch.tid index b85a58fb8..f1e5e1e0c 100644 --- a/core/ui/AdvancedSearch.tid +++ b/core/ui/AdvancedSearch.tid @@ -1,5 +1,5 @@ title: $:/AdvancedSearch
-<> +<>
diff --git a/core/ui/AdvancedSearch/Filter.tid b/core/ui/AdvancedSearch/Filter.tid index f294dfbee..59faae5b9 100644 --- a/core/ui/AdvancedSearch/Filter.tid +++ b/core/ui/AdvancedSearch/Filter.tid @@ -12,7 +12,7 @@ caption: {{$:/language/Search/Filter/Caption}}
<$reveal state=<> type="nomatch" text="" default="">
-<$list filter="[all[tiddlers+shadows]tag[$:/tags/Filter]]"><$link to={{!!filter}}><$transclude field="description"/> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]]"><$link to={{!!filter}}><$transclude field="description"/>
diff --git a/core/ui/ControlPanel.tid b/core/ui/ControlPanel.tid index e91ec2444..ce24e1b32 100644 --- a/core/ui/ControlPanel.tid +++ b/core/ui/ControlPanel.tid @@ -1,5 +1,5 @@ title: $:/ControlPanel
-<> +<>
diff --git a/core/ui/ControlPanel/Advanced.tid b/core/ui/ControlPanel/Advanced.tid index e73a62894..02ed5b153 100644 --- a/core/ui/ControlPanel/Advanced.tid +++ b/core/ui/ControlPanel/Advanced.tid @@ -5,5 +5,5 @@ caption: {{$:/language/ControlPanel/Advanced/Caption}} {{$:/language/ControlPanel/Advanced/Hint}}
-<> +<>
diff --git a/core/ui/ControlPanel/Appearance.tid b/core/ui/ControlPanel/Appearance.tid index d52d75360..e4ea65b9e 100644 --- a/core/ui/ControlPanel/Appearance.tid +++ b/core/ui/ControlPanel/Appearance.tid @@ -5,5 +5,5 @@ caption: {{$:/language/ControlPanel/Appearance/Caption}} {{$:/language/ControlPanel/Appearance/Hint}}
-<> +<>
diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid index b2ca9703f..07653da33 100644 --- a/core/ui/EditTemplate.tid +++ b/core/ui/EditTemplate.tid @@ -6,7 +6,7 @@ tw-tiddler-frame tw-tiddler-edit-frame $(missingTiddlerClass)$ $(shadowTiddlerCl
>> <$set name="storyTiddler" value=<>> <$keyboard key="ctrl+enter" message="tw-save-tiddler"> -<$list filter="[all[tiddlers+shadows]tag[$:/tags/EditTemplate]!has[draft.of]]" variable="listItem"> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditTemplate]!has[draft.of]]" variable="listItem"> <$transclude tiddler=<>/> diff --git a/core/ui/EditTemplate/controls.tid b/core/ui/EditTemplate/controls.tid index 82d5eaa5c..93277362c 100644 --- a/core/ui/EditTemplate/controls.tid +++ b/core/ui/EditTemplate/controls.tid @@ -1,4 +1,4 @@ title: $:/core/ui/EditTemplate/controls tags: $:/tags/EditTemplate - <$list filter="[all[tiddlers+shadows]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<>/> + <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<>/> diff --git a/core/ui/EditTemplate/type.tid b/core/ui/EditTemplate/type.tid index c02768d17..794e61577 100644 --- a/core/ui/EditTemplate/type.tid +++ b/core/ui/EditTemplate/type.tid @@ -8,7 +8,7 @@ tags: $:/tags/EditTemplate <$reveal state=<> type="nomatch" text="" default="">
<$linkcatcher to="!!type"> -<$list filter="[all[tiddlers+shadows]prefix[$:/language/Docs/Types/]] +[sort[description]]"><$link to={{!!name}}><$view field="description"/> (<$view field="name"/>) +<$list filter="[all[shadows+tiddlers]prefix[$:/language/Docs/Types/]] +[sort[description]]"><$link to={{!!name}}><$view field="description"/> (<$view field="name"/>)
diff --git a/core/ui/Filters/SystemTags.tid b/core/ui/Filters/SystemTags.tid index 25ad3b3a2..6a7ca04f6 100644 --- a/core/ui/Filters/SystemTags.tid +++ b/core/ui/Filters/SystemTags.tid @@ -1,5 +1,5 @@ title: $:/core/Filters/SystemTags tags: $:/tags/Filter -filter: [all[tiddlers+shadows]tags[]is[system]sort[title]] +filter: [all[shadows+tiddlers]tags[]is[system]sort[title]] description: {{$:/language/Filters/SystemTags}} diff --git a/core/ui/PageStylesheet.tid b/core/ui/PageStylesheet.tid index 5e81ff6e7..ffca4baf0 100644 --- a/core/ui/PageStylesheet.tid +++ b/core/ui/PageStylesheet.tid @@ -54,6 +54,6 @@ background-image: -ms-linear-gradient($gradient$); \end -<$list filter="[all[tiddlers+shadows]tag[$:/tags/stylesheet]]"> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/stylesheet]]"> <$transclude/> diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid index 7f2cce5b1..5827e7648 100644 --- a/core/ui/PageTemplate.tid +++ b/core/ui/PageTemplate.tid @@ -16,7 +16,7 @@ tw-page-container tw-page-view-$(themeTitle)$ tw-language-$(languageTitle)$ <$dropzone> -<$list filter="[all[tiddlers+shadows]tag[$:/tags/PageTemplate]!has[draft.of]]" variable="listItem"> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageTemplate]!has[draft.of]]" variable="listItem"> <$transclude tiddler=<>/> diff --git a/core/ui/PageTemplate/alerts.tid b/core/ui/PageTemplate/alerts.tid index e8bed8ecf..c296336e5 100644 --- a/core/ui/PageTemplate/alerts.tid +++ b/core/ui/PageTemplate/alerts.tid @@ -3,6 +3,6 @@ tags: $:/tags/PageTemplate
-<$list filter="[all[tiddlers+shadows]tag[$:/tags/Alert]!has[draft.of]]" template="$:/core/ui/AlertTemplate" storyview="pop"/> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/Alert]!has[draft.of]]" template="$:/core/ui/AlertTemplate" storyview="pop"/>
diff --git a/core/ui/PageTemplate/sidebar.tid b/core/ui/PageTemplate/sidebar.tid index 631bc1819..e9f4727a6 100644 --- a/core/ui/PageTemplate/sidebar.tid +++ b/core/ui/PageTemplate/sidebar.tid @@ -21,7 +21,7 @@ tags: $:/tags/PageTemplate
-<$list filter="[all[tiddlers+shadows]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"> <$transclude tiddler=<> mode="inline"/> diff --git a/core/ui/PageTemplate/topleftbar.tid b/core/ui/PageTemplate/topleftbar.tid index e58472b4a..421801b3e 100644 --- a/core/ui/PageTemplate/topleftbar.tid +++ b/core/ui/PageTemplate/topleftbar.tid @@ -3,6 +3,6 @@ tags: $:/tags/PageTemplate -<$list filter="[all[tiddlers+shadows]tag[$:/tags/TopLeftBar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<>/> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/TopLeftBar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<>/> diff --git a/core/ui/PageTemplate/toprightbar.tid b/core/ui/PageTemplate/toprightbar.tid index 89155efe8..eef18bf9e 100644 --- a/core/ui/PageTemplate/toprightbar.tid +++ b/core/ui/PageTemplate/toprightbar.tid @@ -3,6 +3,6 @@ tags: $:/tags/PageTemplate -<$list filter="[all[tiddlers+shadows]tag[$:/tags/TopRightBar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<>/> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/TopRightBar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<>/> diff --git a/core/ui/SideBar/More.tid b/core/ui/SideBar/More.tid index e46088578..53362c478 100644 --- a/core/ui/SideBar/More.tid +++ b/core/ui/SideBar/More.tid @@ -3,5 +3,5 @@ tags: $:/tags/SideBar caption: {{$:/language/SideBar/More/Caption}}
-<> +<>
diff --git a/core/ui/SideBarLists.tid b/core/ui/SideBarLists.tid index 0933103a5..2f5891bc0 100644 --- a/core/ui/SideBarLists.tid +++ b/core/ui/SideBarLists.tid @@ -18,6 +18,6 @@ title: $:/core/ui/SideBarLists
<$reveal state="$:/temp/search" type="match" text=""> - <> + <>
diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid index 504380130..713f03754 100644 --- a/core/ui/TagManager.tid +++ b/core/ui/TagManager.tid @@ -7,7 +7,7 @@ title: $:/TagManager <$reveal state=<> type="nomatch" text="" default=""> <$linkcatcher to="$title$!!icon">
-<$list filter="[all[tiddlers+shadows]is[image]] [all[tiddlers+shadows]tag[$:/tags/Image]] +[sort[title]]"> +<$list filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] +[sort[title]]"> <$link to={{!!title}}> <$view field="title"/> diff --git a/core/ui/TiddlerInfo.tid b/core/ui/TiddlerInfo.tid index bd80da6c5..d9753afb9 100644 --- a/core/ui/TiddlerInfo.tid +++ b/core/ui/TiddlerInfo.tid @@ -1,3 +1,3 @@ title: $:/core/ui/TiddlerInfo -<> +<> diff --git a/core/ui/TiddlerInfo/Advanced.tid b/core/ui/TiddlerInfo/Advanced.tid index d2428e2b7..d14144558 100644 --- a/core/ui/TiddlerInfo/Advanced.tid +++ b/core/ui/TiddlerInfo/Advanced.tid @@ -2,7 +2,7 @@ title: $:/core/ui/TiddlerInfo/Advanced tags: $:/tags/TiddlerInfo caption: {{$:/language/TiddlerInfo/Advanced/Caption}} -<$list filter="[all[tiddlers+shadows]tag[$:/tags/TiddlerInfo/Advanced]!has[draft.of]]" variable="listItem"> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/TiddlerInfo/Advanced]!has[draft.of]]" variable="listItem"> <$transclude tiddler=<>/> diff --git a/core/ui/ViewTemplate.tid b/core/ui/ViewTemplate.tid index 73c99d69d..717b00699 100644 --- a/core/ui/ViewTemplate.tid +++ b/core/ui/ViewTemplate.tid @@ -3,6 +3,6 @@ title: $:/core/ui/ViewTemplate \define frame-classes() tw-tiddler-frame tw-tiddler-view-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$ \end -<$set name="storyTiddler" value=<>><$set name="tiddlerInfoState" value=<>><$tiddler tiddler=<>>
>><$list filter="[all[tiddlers+shadows]tag[$:/tags/ViewTemplate]!has[draft.of]]" variable="listItem"><$transclude tiddler=<>/> +<$set name="storyTiddler" value=<>><$set name="tiddlerInfoState" value=<>><$tiddler tiddler=<>>
>><$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate]!has[draft.of]]" variable="listItem"><$transclude tiddler=<>/>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid index b5edeab27..1b49c8661 100644 --- a/core/ui/ViewTemplate/title.tid +++ b/core/ui/ViewTemplate/title.tid @@ -7,7 +7,7 @@ fill:$(foregroundColor)$;
-<$list filter="[all[tiddlers+shadows]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<>/> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<>/> <$set name="foregroundColor" value={{!!color}}> >> diff --git a/core/wiki/paletteswitcher.tid b/core/wiki/paletteswitcher.tid index 792fac738..0013beb8e 100644 --- a/core/wiki/paletteswitcher.tid +++ b/core/wiki/paletteswitcher.tid @@ -4,7 +4,7 @@ title: $:/snippets/paletteswitcher <> <$view tiddler={{$:/palette}} field="name"/> <$linkcatcher to="$:/palette"> -
<$list filter="[all[tiddlers+shadows]tag[$:/tags/Palette]sort[description]]">
<$link to={{!!title}}>
<$reveal state="$:/palette" type="match" text={{!!title}}>•<$reveal state="$:/palette" type="nomatch" text={{!!title}}>  ''<$view field="name" format="text"/>'' - <$view field="description" format="text"/>
<$transclude tiddler="$:/snippets/currpalettepreview"/>
+
<$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]sort[description]]">
<$link to={{!!title}}>
<$reveal state="$:/palette" type="match" text={{!!title}}>•<$reveal state="$:/palette" type="nomatch" text={{!!title}}>  ''<$view field="name" format="text"/>'' - <$view field="description" format="text"/>
<$transclude tiddler="$:/snippets/currpalettepreview"/>
\ No newline at end of file diff --git a/editions/tw5.com/tiddlers/Changes to filters in 5.0.9-beta.tid b/editions/tw5.com/tiddlers/Changes to filters in 5.0.9-beta.tid index eb3eda30f..6749a594a 100644 --- a/editions/tw5.com/tiddlers/Changes to filters in 5.0.9-beta.tid +++ b/editions/tw5.com/tiddlers/Changes to filters in 5.0.9-beta.tid @@ -33,7 +33,7 @@ Previously, it was common to have `[is[shadow]]` at the start of a filter string In 5.0.9, that filter has been changed to: ``` -[all[tiddlers+shadows]tag[$:/tags/AdvancedSearch]!has[draft.of]] +[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch]!has[draft.of]] ``` Note how the ''all'' operator allows operations to be performed on tiddlers from combinations of sources. diff --git a/editions/tw5.com/tiddlers/concepts/SystemTags.tid b/editions/tw5.com/tiddlers/concepts/SystemTags.tid index 72085dea9..da46de312 100644 --- a/editions/tw5.com/tiddlers/concepts/SystemTags.tid +++ b/editions/tw5.com/tiddlers/concepts/SystemTags.tid @@ -22,4 +22,4 @@ System tags are used to give special behaviour to tiddlers: These are the system tags in use in this wiki: -{{{ [all[tiddlers+shadows]tags[]prefix[$:/]] +[sort[title]] }}} +{{{ [all[shadows+tiddlers]tags[]prefix[$:/]] +[sort[title]] }}} diff --git a/editions/tw5.com/tiddlers/filters/FilterOperator tag.tid b/editions/tw5.com/tiddlers/filters/FilterOperator tag.tid index aa2ab6605..546b50313 100644 --- a/editions/tw5.com/tiddlers/filters/FilterOperator tag.tid +++ b/editions/tw5.com/tiddlers/filters/FilterOperator tag.tid @@ -11,7 +11,7 @@ For example: |!Filter String |!Description | |`[tag[mytag]]` |Returns all tiddlers tagged `mytag` | |`[all[shadows]tag[mytag]]` |Returns all ShadowTiddlers tagged `mytag` | -|`[all[tiddlers+shadows]tag[mytag]]` |Returns all ShadowTiddlers and non-ShadowTiddlers tagged `mytag` | +|`[all[shadows+tiddlers]tag[mytag]]` |Returns all ShadowTiddlers and non-ShadowTiddlers tagged `mytag` | |`[!tag[mytag]]` |Returns all tiddlers not tagged `mytag` | |`[tag[mytag]!tag[exclude]]` |Returns all tiddlers tagged `mytag` that are not tagged `mytag` | diff --git a/plugins/tiddlywiki/tiddlyweb/download-offline.tid b/plugins/tiddlywiki/tiddlyweb/download-offline.tid index 377a4130c..cb10f7aad 100644 --- a/plugins/tiddlywiki/tiddlyweb/download-offline.tid +++ b/plugins/tiddlywiki/tiddlyweb/download-offline.tid @@ -1,6 +1,6 @@ title: $:/editions/clientserver/download-offline \define saveTiddlerFilter() -[all[tiddlers+shadows]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] +[sort[title]] +[all[shadows+tiddlers]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] +[sort[title]] \end {{$:/core/templates/tiddlywiki5.html}}