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

also exclude in new windows

This commit is contained in:
BurningTreeC 2024-03-27 10:00:35 +01:00
parent 0e27c74a7c
commit 983a569ea4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ exports.startup = function() {
},false);
// Set up the styles
function setStylesheets() {
for(var i=0; i<$tw.stylesheetTiddlers.length; i++) {
for(var i=0; i<$tw.windows[windowID].stylesheetTiddlers.length; i++) {
var stylesheetText = $tw.wiki.getTiddlerText($tw.stylesheetTiddlers[i]);
$tw.utils.extend(variables,{ stylesheet: stylesheetText });
var styleWidgetNode = $tw.wiki.makeTranscludeWidget("$:/core/ui/RootStylesheet",{
@ -89,6 +89,7 @@ exports.startup = function() {
}
$tw.windows[windowID].stylesheetTiddlers = getStylesheets();
$tw.windows[windowID].excludedStylesheets = $tw.wiki.getTiddlersWithTag("$:/tags/Stylesheet/Static");
$tw.windows[windowID].styleWidgetNodes = [];
$tw.windows[windowID].styleContainers = [];
$tw.windows[windowID].styleElements = [];
@ -101,6 +102,7 @@ exports.startup = function() {
// Function to handle refreshes
refreshHandler = function(changes) {
var stylesheetTiddlers = getStylesheets();
$tw.windows[windowID].excludedStylesheets = $tw.wiki.getTiddlersWithTag("$:/tags/Stylesheet/Static");
if(!$tw.utils.arraysEqual(stylesheetTiddlers,$tw.windows[windowID].stylesheetTiddlers) || $tw.utils.hopArray(changes,stylesheetTiddlers)) {
for(var i=0; i<$tw.windows[windowID].stylesheetTiddlers.length; i++) {
srcDocument.head.removeChild($tw.windows[windowID].styleElements[i]);
@ -111,12 +113,14 @@ exports.startup = function() {
$tw.windows[windowID].styleElements = [];
setStylesheets();
}
for(var i=0; i<$tw.stylesheetTiddlers.length; i++) {
if($tw.windows[windowID].styleWidgetNodes[i].refresh(changes,$tw.windows[windowID].styleContainers[i],null)) {
var newStyles = $tw.windows[windowID].styleContainers[i].textContent;
if(newStyles !== $tw.windows[windowID].styleWidgetNodes[i].assignedStyles) {
$tw.windows[windowID].styleWidgetNodes[i].assignedStyles = newStyles;
$tw.windows[windowID].styleElements[i].innerHTML = $tw.windows[windowID].styleWidgetNodes[i].assignedStyles;
for(var i=0; i<$tw.windows[windowID].stylesheetTiddlers.length; i++) {
if($tw.windows[windowID].excludedStylesheets.indexOf($tw.windows[windowID].stylesheetTiddlers[i]) === -1) {
if($tw.windows[windowID].styleWidgetNodes[i].refresh(changes,$tw.windows[windowID].styleContainers[i],null)) {
var newStyles = $tw.windows[windowID].styleContainers[i].textContent;
if(newStyles !== $tw.windows[windowID].styleWidgetNodes[i].assignedStyles) {
$tw.windows[windowID].styleWidgetNodes[i].assignedStyles = newStyles;
$tw.windows[windowID].styleElements[i].innerHTML = $tw.windows[windowID].styleWidgetNodes[i].assignedStyles;
}
}
}
}