mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-08-07 06:14:44 +00:00
Code Issues Releases Wiki Activity

further optimizations

Browse Source
This commit is contained in:
BurningTreeC 2024-09-28 17:00:04 +02:00
parent ecc410e600
commit 6355aaaaef
11 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/modules/widgets/refresh-blocker.js
View File

@ -14,10 +14,6 @@ RefreshBlocker widget
var Widget = require("$:/core/modules/widgets/widget.js").widget; var Widget = require("$:/core/modules/widgets/widget.js").widget;
var RefreshBlocker = function(parseTreeNode,options) {
this.initialise(parseTreeNode,options);
};
var RefreshBlockerWidget = function(parseTreeNode,options) { var RefreshBlockerWidget = function(parseTreeNode,options) {
this.initialise(parseTreeNode,options); this.initialise(parseTreeNode,options);
}; };
@ -41,14 +37,17 @@ RefreshBlockerWidget.prototype.render = function(parent,nextSibling) {
Compute the internal state of the widget Compute the internal state of the widget
*/ */
RefreshBlockerWidget.prototype.execute = function() { RefreshBlockerWidget.prototype.execute = function() {
this.refreshBlockerList = this.getAttribute("refreshBlockerList");
// Make child widgets // Make child widgets
this.makeChildWidgets(); this.makeChildWidgets();
}; };
RefreshBlockerWidget.prototype.refresh = function(changedTiddlers) { RefreshBlockerWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes(); var changedAttributes = this.computeAttributes();
var refreshBlockerList = this.wiki.filterTiddlers(this.getAttribute("refreshBlockerList")); if(changedAttributes.refreshBlockerList) {
if(refreshBlockerList && (this.getAttribute("enabled") === "yes") && $tw.utils.hopArray(changedTiddlers,refreshBlockerList)) { this.refreshSelf();
return true;
} else if(this.refreshBlockerList && $tw.utils.hopArray(changedTiddlers,this.wiki.filterTiddlers(this.refreshBlockerList))) {
return false; return false;
} else { } else {
return this.refreshChildren(changedTiddlers); return this.refreshChildren(changedTiddlers);

5
core/ui/RootStylesheet.tid
View File

@ -3,9 +3,10 @@ code-body: yes
\import [subfilter{$:/core/config/GlobalImportFilter}] \import [subfilter{$:/core/config/GlobalImportFilter}]
\whitespace trim \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]]"> <$list filter="[all[shadows+tiddlers]!is[draft]tag[$:/tags/Stylesheet]]">
<$refresh-blocker refreshBlockerList={{{ [<currentTiddler>get[refresh-blocker-list]] ~[<refreshBlockerList>] }}} enabled="yes"> <$refresh-blocker refreshBlockerList={{{ [<currentTiddler>get[refresh-blocker-list]] }}}>
<style type="text/css"> <style type="text/css">
<$view format={{{ [<currentTiddler>tag[$:/tags/Stylesheet/Static]then[text]else[plainwikified]] }}} mode="block"/> <$view format={{{ [<currentTiddler>tag[$:/tags/Stylesheet/Static]then[text]else[plainwikified]] }}} mode="block"/>
</style> </style>

2
core/wiki/macros/sidebar-resizer.tid
View File

@ -4,12 +4,12 @@ tags: $:/tags/Global
\procedure sidebar-resizer-pointerdown-actions() \procedure sidebar-resizer-pointerdown-actions()
<%if [[$:/state/sidebar/resizing]is[missing]then<event-mousebutton>match[left]] %> <%if [[$:/state/sidebar/resizing]is[missing]then<event-mousebutton>match[left]] %>
<$let dragDiff=<<event-fromselected-posx>> storyRiverWidth={{{ [<event-fromcatcher-posx>subtract<dragDiff>] }}} sidebarWidth={{{ [<tv-widgetnode-width>subtract<event-fromcatcher-posx>add<dragDiff>] }}}> <$let dragDiff=<<event-fromselected-posx>> storyRiverWidth={{{ [<event-fromcatcher-posx>subtract<dragDiff>] }}} sidebarWidth={{{ [<tv-widgetnode-width>subtract<event-fromcatcher-posx>add<dragDiff>] }}}>
<$action-setfield $tiddler="$:/state/sidebar/resizing" text="yes"/>
<$action-setfield $tiddler="$:/state/sidebar/dimensions" <$action-setfield $tiddler="$:/state/sidebar/dimensions"
drag-diff=<<dragDiff>> drag-diff=<<dragDiff>>
story-river-width=<<storyRiverWidth>> story-river-width=<<storyRiverWidth>>
sidebar-width=<<sidebarWidth>> sidebar-width=<<sidebarWidth>>
/> />
<$action-setfield $tiddler="$:/state/sidebar/resizing" text="yes"/>
</$let> </$let>
<% endif %> <% endif %>
\end \end

1
plugins/tiddlywiki/dynannotate/styles.tid
View File

@ -1,5 +1,6 @@
title: $:/plugins/tiddlywiki/dynannotate/styles title: $:/plugins/tiddlywiki/dynannotate/styles
tags: [[$:/tags/Stylesheet]] tags: [[$:/tags/Stylesheet]]
refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]
\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline

2
plugins/tiddlywiki/menubar/styles.tid
View File

@ -1,6 +1,6 @@
title: $:/plugins/tiddlywiki/menubar/styles title: $:/plugins/tiddlywiki/menubar/styles
tags: [[$:/tags/Stylesheet]] 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() \define breakpoint-plus-one()
<$text text={{{ [{$:/config/plugins/menubar/breakpoint}removesuffix[px]add[1]addsuffix[px]] ~[{$:/config/plugins/menubar/breakpoint}] }}} /> <$text text={{{ [{$:/config/plugins/menubar/breakpoint}removesuffix[px]add[1]addsuffix[px]] ~[{$:/config/plugins/menubar/breakpoint}] }}} />

3
plugins/tiddlywiki/railroad/files/tiddlywiki.files
View File

@ -5,7 +5,8 @@
"fields": { "fields": {
"type": "text/vnd.tiddlywiki", "type": "text/vnd.tiddlywiki",
"title": "$:/plugins/tiddlywiki/railroad/railroad-diagrams.css", "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", "file": "railroad-diagrams.js",

1
plugins/tiddlywiki/tour/styles.tid
View File

@ -1,5 +1,6 @@
title: $:/plugins/tiddlywiki/tour/styles title: $:/plugins/tiddlywiki/tour/styles
tags: $:/tags/Stylesheet 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 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock

4
themes/tiddlywiki/snowwhite/base.tid
View File

@ -1,12 +1,12 @@
title: $:/themes/tiddlywiki/snowwhite/base title: $:/themes/tiddlywiki/snowwhite/base
tags: [[$:/tags/Stylesheet]] 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() \define sidebarbreakpoint-minus-one()
<$text text={{{ [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}removesuffix[px]subtract[1]addsuffix[px]] ~[{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}] }}}/> <$text text={{{ [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}removesuffix[px]subtract[1]addsuffix[px]] ~[{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}] }}}/>
\end \end
\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline html \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
.tc-sidebar-header { .tc-sidebar-header {
text-shadow: 0 1px 0 <<colour sidebar-foreground-shadow>>; text-shadow: 0 1px 0 <<colour sidebar-foreground-shadow>>;

4
themes/tiddlywiki/vanilla/base.tid
View File

@ -1,7 +1,7 @@
title: $:/themes/tiddlywiki/vanilla/base title: $:/themes/tiddlywiki/vanilla/base
tags: [[$:/tags/Stylesheet]] tags: [[$:/tags/Stylesheet]]
list-before: $:/themes/tiddlywiki/vanilla/fluid-fixed 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 code-body: yes
\define custom-background-datauri() \define custom-background-datauri()
@ -55,7 +55,7 @@ $else$
</$set> </$set>
\end \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 ** Start with the normalize CSS reset, and then belay some of its effects

6
themes/tiddlywiki/vanilla/fluid-fixed.tid
View File

@ -1,7 +1,7 @@
title: $:/themes/tiddlywiki/vanilla/fluid-fixed title: $:/themes/tiddlywiki/vanilla/fluid-fixed
tags: [[$:/tags/Stylesheet]] tags: [[$:/tags/Stylesheet]]
list-before: 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) \define if-fluid-fixed(text,hiddenSidebarText)
<%if [{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fluid-fixed]] [[$:/state/sidebar/dimensions]!is[missing]] %> <%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}] }}}/> <$text text={{{ [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}removesuffix[px]subtract[1]addsuffix[px]] ~[{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}] }}}/>
\end \end
\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock
/* /*
** Adjustments for fluid-fixed mode ** Adjustments for fluid-fixed mode
*/ */
@ -68,4 +70,4 @@ $hiddenSidebarText$
""">> """>>
} }

7
themes/tiddlywiki/vanilla/sidebar-resizer.tid
View File

@ -1,7 +1,6 @@
title: $:/themes/tiddlywiki/vanilla/sidebar-resizer title: $:/themes/tiddlywiki/vanilla/sidebar-resizer
tags: [[$:/tags/Stylesheet]] 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 refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] -$:/state/sidebar/resizing -$:/state/sidebar/dimensions -$:/state/sidebar
code-body: yes
\define sidebarbreakpoint() \define sidebarbreakpoint()
<$text text={{$:/themes/tiddlywiki/vanilla/metrics/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}] }}}/> <$text text={{{ [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}removesuffix[px]subtract[1]addsuffix[px]] ~[{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}] }}}/>
\end \end
\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock conditional
@media (min-width: <<sidebarbreakpoint>>) { @media (min-width: <<sidebarbreakpoint>>) {
.tc-sidebar-resizer-pointerdown-eventcatcher { .tc-sidebar-resizer-pointerdown-eventcatcher {
@ -148,4 +149,4 @@ code-body: yes
.tc-sidebar-resizer-pointermove-eventcatcher, .tc-sidebar-resizer { .tc-sidebar-resizer-pointermove-eventcatcher, .tc-sidebar-resizer {
display: none; display: none;
} }
} }