From 6355aaaaefed2c750d4e4d9c3a9eb4f3fde81ac7 Mon Sep 17 00:00:00 2001 From: BurningTreeC Date: Sat, 28 Sep 2024 17:00:04 +0200 Subject: [PATCH] further optimizations --- core/modules/widgets/refresh-blocker.js | 11 +++++------ core/ui/RootStylesheet.tid | 5 +++-- core/wiki/macros/sidebar-resizer.tid | 2 +- plugins/tiddlywiki/dynannotate/styles.tid | 1 + plugins/tiddlywiki/menubar/styles.tid | 2 +- plugins/tiddlywiki/railroad/files/tiddlywiki.files | 3 ++- plugins/tiddlywiki/tour/styles.tid | 1 + themes/tiddlywiki/snowwhite/base.tid | 4 ++-- themes/tiddlywiki/vanilla/base.tid | 4 ++-- themes/tiddlywiki/vanilla/fluid-fixed.tid | 6 ++++-- themes/tiddlywiki/vanilla/sidebar-resizer.tid | 7 ++++--- 11 files changed, 26 insertions(+), 20 deletions(-) diff --git a/core/modules/widgets/refresh-blocker.js b/core/modules/widgets/refresh-blocker.js index 790b2242f..451828710 100644 --- a/core/modules/widgets/refresh-blocker.js +++ b/core/modules/widgets/refresh-blocker.js @@ -14,10 +14,6 @@ RefreshBlocker widget var Widget = require("$:/core/modules/widgets/widget.js").widget; -var RefreshBlocker = function(parseTreeNode,options) { - this.initialise(parseTreeNode,options); -}; - var RefreshBlockerWidget = function(parseTreeNode,options) { this.initialise(parseTreeNode,options); }; @@ -41,14 +37,17 @@ RefreshBlockerWidget.prototype.render = function(parent,nextSibling) { Compute the internal state of the widget */ RefreshBlockerWidget.prototype.execute = function() { + this.refreshBlockerList = this.getAttribute("refreshBlockerList"); // Make child widgets this.makeChildWidgets(); }; RefreshBlockerWidget.prototype.refresh = function(changedTiddlers) { var changedAttributes = this.computeAttributes(); - var refreshBlockerList = this.wiki.filterTiddlers(this.getAttribute("refreshBlockerList")); - if(refreshBlockerList && (this.getAttribute("enabled") === "yes") && $tw.utils.hopArray(changedTiddlers,refreshBlockerList)) { + if(changedAttributes.refreshBlockerList) { + this.refreshSelf(); + return true; + } else if(this.refreshBlockerList && $tw.utils.hopArray(changedTiddlers,this.wiki.filterTiddlers(this.refreshBlockerList))) { return false; } else { return this.refreshChildren(changedTiddlers); diff --git a/core/ui/RootStylesheet.tid b/core/ui/RootStylesheet.tid index 4c94c2daf..eacc6e9ae 100644 --- a/core/ui/RootStylesheet.tid +++ b/core/ui/RootStylesheet.tid @@ -3,9 +3,10 @@ code-body: yes \import [subfilter{$:/core/config/GlobalImportFilter}] \whitespace trim -<$let currentTiddler={{$:/language}} languageTitle={{!!name}} refreshBlockerList="[all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]]"> +\rules only filteredtranscludeinline transcludeinline html +<$let currentTiddler={{$:/language}} languageTitle={{!!name}}> <$list filter="[all[shadows+tiddlers]!is[draft]tag[$:/tags/Stylesheet]]"> - <$refresh-blocker refreshBlockerList={{{ [get[refresh-blocker-list]] ~[] }}} enabled="yes"> + <$refresh-blocker refreshBlockerList={{{ [get[refresh-blocker-list]] }}}> diff --git a/core/wiki/macros/sidebar-resizer.tid b/core/wiki/macros/sidebar-resizer.tid index 9f3e7113d..9d808801f 100644 --- a/core/wiki/macros/sidebar-resizer.tid +++ b/core/wiki/macros/sidebar-resizer.tid @@ -4,12 +4,12 @@ tags: $:/tags/Global \procedure sidebar-resizer-pointerdown-actions() <%if [[$:/state/sidebar/resizing]is[missing]thenmatch[left]] %> <$let dragDiff=<> storyRiverWidth={{{ [subtract] }}} sidebarWidth={{{ [subtractadd] }}}> + <$action-setfield $tiddler="$:/state/sidebar/resizing" text="yes"/> <$action-setfield $tiddler="$:/state/sidebar/dimensions" drag-diff=<> story-river-width=<> sidebar-width=<> /> - <$action-setfield $tiddler="$:/state/sidebar/resizing" text="yes"/> <% endif %> \end diff --git a/plugins/tiddlywiki/dynannotate/styles.tid b/plugins/tiddlywiki/dynannotate/styles.tid index 9143b8fd0..a579117bd 100644 --- a/plugins/tiddlywiki/dynannotate/styles.tid +++ b/plugins/tiddlywiki/dynannotate/styles.tid @@ -1,5 +1,6 @@ title: $:/plugins/tiddlywiki/dynannotate/styles tags: [[$:/tags/Stylesheet]] +refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline diff --git a/plugins/tiddlywiki/menubar/styles.tid b/plugins/tiddlywiki/menubar/styles.tid index 60a9b1e68..ff0539934 100644 --- a/plugins/tiddlywiki/menubar/styles.tid +++ b/plugins/tiddlywiki/menubar/styles.tid @@ -1,6 +1,6 @@ title: $:/plugins/tiddlywiki/menubar/styles tags: [[$:/tags/Stylesheet]] -refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]] -$:/state/popup/menubar/hamburger +refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] -$:/state/popup/menubar/hamburger \define breakpoint-plus-one() <$text text={{{ [{$:/config/plugins/menubar/breakpoint}removesuffix[px]add[1]addsuffix[px]] ~[{$:/config/plugins/menubar/breakpoint}] }}} /> diff --git a/plugins/tiddlywiki/railroad/files/tiddlywiki.files b/plugins/tiddlywiki/railroad/files/tiddlywiki.files index 3a25325e5..266250366 100644 --- a/plugins/tiddlywiki/railroad/files/tiddlywiki.files +++ b/plugins/tiddlywiki/railroad/files/tiddlywiki.files @@ -5,7 +5,8 @@ "fields": { "type": "text/vnd.tiddlywiki", "title": "$:/plugins/tiddlywiki/railroad/railroad-diagrams.css", - "tags": "$:/tags/Stylesheet" + "tags": "$:/tags/Stylesheet", + "refresh-blocker-list": "[all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]" } },{ "file": "railroad-diagrams.js", diff --git a/plugins/tiddlywiki/tour/styles.tid b/plugins/tiddlywiki/tour/styles.tid index 7bb434dab..703e5bd74 100644 --- a/plugins/tiddlywiki/tour/styles.tid +++ b/plugins/tiddlywiki/tour/styles.tid @@ -1,5 +1,6 @@ title: $:/plugins/tiddlywiki/tour/styles tags: $:/tags/Stylesheet +refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid index 5894e6ca1..cf33b9d59 100644 --- a/themes/tiddlywiki/snowwhite/base.tid +++ b/themes/tiddlywiki/snowwhite/base.tid @@ -1,12 +1,12 @@ title: $:/themes/tiddlywiki/snowwhite/base tags: [[$:/tags/Stylesheet]] -refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]] +refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] \define sidebarbreakpoint-minus-one() <$text text={{{ [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}removesuffix[px]subtract[1]addsuffix[px]] ~[{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}] }}}/> \end -\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline html +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline .tc-sidebar-header { text-shadow: 0 1px 0 <>; diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index a4167f2e8..399ed8bd5 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -1,7 +1,7 @@ title: $:/themes/tiddlywiki/vanilla/base tags: [[$:/tags/Stylesheet]] list-before: $:/themes/tiddlywiki/vanilla/fluid-fixed -refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]] +refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] code-body: yes \define custom-background-datauri() @@ -55,7 +55,7 @@ $else$ \end -\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock html +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock /* ** Start with the normalize CSS reset, and then belay some of its effects diff --git a/themes/tiddlywiki/vanilla/fluid-fixed.tid b/themes/tiddlywiki/vanilla/fluid-fixed.tid index ac5c82394..2a48d3778 100644 --- a/themes/tiddlywiki/vanilla/fluid-fixed.tid +++ b/themes/tiddlywiki/vanilla/fluid-fixed.tid @@ -1,7 +1,7 @@ title: $:/themes/tiddlywiki/vanilla/fluid-fixed tags: [[$:/tags/Stylesheet]] list-before: -refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]] -$:/state/sidebar -$:/state/sidebar/dimensions +refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] -$:/state/sidebar -$:/state/sidebar/dimensions \define if-fluid-fixed(text,hiddenSidebarText) <%if [{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fluid-fixed]] [[$:/state/sidebar/dimensions]!is[missing]] %> @@ -20,6 +20,8 @@ $hiddenSidebarText$ <$text text={{{ [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}removesuffix[px]subtract[1]addsuffix[px]] ~[{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}] }}}/> \end +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock + /* ** Adjustments for fluid-fixed mode */ @@ -68,4 +70,4 @@ $hiddenSidebarText$ """>> -} \ No newline at end of file +} diff --git a/themes/tiddlywiki/vanilla/sidebar-resizer.tid b/themes/tiddlywiki/vanilla/sidebar-resizer.tid index b996a58ad..d14bc4687 100644 --- a/themes/tiddlywiki/vanilla/sidebar-resizer.tid +++ b/themes/tiddlywiki/vanilla/sidebar-resizer.tid @@ -1,7 +1,6 @@ title: $:/themes/tiddlywiki/vanilla/sidebar-resizer tags: [[$:/tags/Stylesheet]] -refresh-blocker-list: [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] [all[tiddlers]is[draft]] -$:/state/sidebar/resizing -$:/state/sidebar/dimensions -$:/state/sidebar -code-body: yes +refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] -$:/state/sidebar/resizing -$:/state/sidebar/dimensions -$:/state/sidebar \define sidebarbreakpoint() <$text text={{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}/> @@ -11,6 +10,8 @@ code-body: yes <$text text={{{ [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}removesuffix[px]subtract[1]addsuffix[px]] ~[{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}] }}}/> \end +\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock conditional + @media (min-width: <>) { .tc-sidebar-resizer-pointerdown-eventcatcher { @@ -148,4 +149,4 @@ code-body: yes .tc-sidebar-resizer-pointermove-eventcatcher, .tc-sidebar-resizer { display: none; } -} \ No newline at end of file +}