mirrors
/
TiddlyWiki5
mirror of https://github.com/Jermolene/TiddlyWiki5
1
0
Fork 0
Code Issues Releases Wiki Activity

update: use RootStylesheet (new). refactor render.js

This commit is contained in:
BurningTreeC 2024-03-26 19:42:16 +01:00
parent cc9fb0df1c
commit 363a1acdd8
4 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/modules/startup/render.js
View File

@ -20,7 +20,7 @@ exports.synchronous = true;
// Default story and history lists
var PAGE_TITLE_TITLE = "$:/core/wiki/title";
var PAGE_STYLESHEET_TITLE = "$:/core/ui/PageStylesheet";
var PAGE_STYLESHEET_TITLE = "$:/core/ui/RootStylesheet";
var PAGE_TEMPLATE_TITLE = "$:/core/ui/RootTemplate";
// Time (in ms) that we defer refreshing changes to draft tiddlers
@ -59,7 +59,19 @@ exports.startup = function() {
function getStylesheets() {
// Get our stylesheets in reversed order
return $tw.wiki.filterTiddlers("[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]reverse[]]");
return $tw.wiki.filterTiddlers("[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]").reverse();
}
function detectStylesheetRefresh(changes) {
for(var i=0; i<$tw.stylesheetTiddlers.length; i++) {
if($tw.styleWidgetNodes[i].refresh(changes,$tw.styleContainers[i],null)) {
var newStyles = $tw.styleContainers[i].textContent;
if(newStyles !== $tw.styleWidgetNodes[i].assignedStyles) {
$tw.styleWidgetNodes[i].assignedStyles = newStyles;
$tw.styleElements[i].innerHTML = $tw.styleWidgetNodes[i].assignedStyles;
}
}
}
}
// Get our stylesheets
@ -67,10 +79,8 @@ exports.startup = function() {
$tw.styleWidgetNodes = [];
$tw.styleContainers = [];
$tw.styleElements = [];
setStylesheets();
// Listen for changes: Added / removed stylesheet Tiddlers, changed stylesheet Tiddlers
$tw.wiki.addEventListener("change",function(changes) {
var stylesheetTiddlers = getStylesheets();
if(stylesheetTiddlers.length !== $tw.stylesheetTiddlers.length || $tw.utils.hopArray(changes,stylesheetTiddlers)) {
@ -84,19 +94,10 @@ exports.startup = function() {
setStylesheets();
}
$tw.perf.report("styleRefresh",function() {
detectStylesheetRefresh(changes);
})();
});
$tw.wiki.addEventListener("change",$tw.perf.report("styleRefresh",function(changes) {
for(var i=0; i<$tw.stylesheetTiddlers.length; i++) {
if($tw.styleWidgetNodes[i].refresh(changes,$tw.styleContainers[i],null)) {
var newStyles = $tw.styleContainers[i].textContent;
if(newStyles !== $tw.styleWidgetNodes[i].assignedStyles) {
$tw.styleWidgetNodes[i].assignedStyles = newStyles;
$tw.styleElements[i].innerHTML = $tw.styleWidgetNodes[i].assignedStyles;
}
}
}
}));
// Display the $:/core/ui/PageTemplate tiddler to kick off the display
$tw.perf.report("mainRender",function() {
$tw.pageWidgetNode = $tw.wiki.makeTranscludeWidget(PAGE_TEMPLATE_TITLE,{document: document, parentWidget: $tw.rootWidget, recursionMarker: "no"});

6
core/modules/startup/windows.js
View File

@ -68,7 +68,7 @@ exports.startup = function() {
for(var i=0; i<$tw.stylesheetTiddlers.length; i++) {
var stylesheetText = $tw.wiki.getTiddlerText($tw.stylesheetTiddlers[i]);
$tw.utils.extend(variables,{ stylesheet: stylesheetText });
var styleWidgetNode = $tw.wiki.makeTranscludeWidget("$:/core/ui/PageStylesheet",{
var styleWidgetNode = $tw.wiki.makeTranscludeWidget("$:/core/ui/RootStylesheet",{
document: $tw.fakeDocument,
variables: variables,
importPageMacros: true}),
@ -85,14 +85,13 @@ exports.startup = function() {
function getStylesheets() {
// Get our stylesheets in reversed order
return $tw.wiki.filterTiddlers("[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]reverse[]]");
return $tw.wiki.filterTiddlers("[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]").reverse();
}
$tw.windows[windowID].stylesheetTiddlers = getStylesheets();
$tw.windows[windowID].styleWidgetNodes = [];
$tw.windows[windowID].styleContainers = [];
$tw.windows[windowID].styleElements = [];
setStylesheets();
// Render the text of the tiddler
@ -110,7 +109,6 @@ exports.startup = function() {
$tw.windows[windowID].styleWidgetNodes = [];
$tw.windows[windowID].styleContainers = [];
$tw.windows[windowID].styleElements = [];
setStylesheets();
}
for(var i=0; i<$tw.stylesheetTiddlers.length; i++) {

4
core/ui/PageStylesheet.tid
View File

@ -8,7 +8,9 @@ code-body: yes
<$set name="languageTitle" value={{!!name}}>
<<stylesheet>>
<$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]!has[draft.of]]">
<$transclude mode="block"/>
</$list>
</$set>

15
core/ui/RootStylesheet.tid Normal file
View File

@ -0,0 +1,15 @@
title: $:/core/ui/RootStylesheet
code-body: yes
\import [subfilter{$:/core/config/GlobalImportFilter}]
\whitespace trim
<$set name="currentTiddler" value={{$:/language}}>
<$set name="languageTitle" value={{!!name}}>
<<stylesheet>>
</$set>
</$set>