mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-03-01 01:10:03 +00:00
Code Issues Releases Wiki Activity

Fix: Don't set dirty flag when shadow tiddler changes (#8903)

Browse Source 
Adds `shadow` and `normal` flags to each entry in `changedTiddlers`,
indicating whether the corresponding version of the tiddler has changed.
Makes the saver handler ignore any changes that aren't flagged `normal`.

Fixes #8902.
This commit is contained in:
Rhys-T 2025-01-25 05:59:51 -05:00 committed by GitHub
parent 843f133f5e
commit 94b325f41f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/modules/saver-handler.js
View File

@ -46,8 +46,10 @@ function SaverHandler(options) {
// Filter the changes so that we only count changes to tiddlers that we care about // Filter the changes so that we only count changes to tiddlers that we care about
var filteredChanges = self.filterFn.call(self.wiki,function(iterator) { var filteredChanges = self.filterFn.call(self.wiki,function(iterator) {
$tw.utils.each(changes,function(change,title) { $tw.utils.each(changes,function(change,title) {
var tiddler = self.wiki.getTiddler(title); if(change.normal) {
iterator(tiddler,title); var tiddler = self.wiki.getTiddler(title);
iterator(tiddler,title);
}
}); });
}); });
// Adjust the number of changes // Adjust the number of changes

2
core/modules/startup/plugins.js
View File

@ -75,7 +75,7 @@ exports.startup = function() {
$tw.wiki.unpackPluginTiddlers(); $tw.wiki.unpackPluginTiddlers();
// Queue change events for the changed shadow tiddlers // Queue change events for the changed shadow tiddlers
$tw.utils.each(Object.keys(changedShadowTiddlers),function(title) { $tw.utils.each(Object.keys(changedShadowTiddlers),function(title) {
$tw.wiki.enqueueTiddlerEvent(title,changedShadowTiddlers[title]); $tw.wiki.enqueueTiddlerEvent(title,changedShadowTiddlers[title], true);
}); });
} }
} }

5
core/modules/wiki.js
View File

@ -141,12 +141,15 @@ This method should be called after the changes it describes have been made to th
title: Title of tiddler title: Title of tiddler
isDeleted: defaults to false (meaning the tiddler has been created or modified), isDeleted: defaults to false (meaning the tiddler has been created or modified),
true if the tiddler has been deleted true if the tiddler has been deleted
isShadow: defaults to false (meaning the change applies to the normal tiddler),
true if the tiddler being changed is a shadow tiddler
*/ */
exports.enqueueTiddlerEvent = function(title,isDeleted) { exports.enqueueTiddlerEvent = function(title,isDeleted,isShadow) {
// Record the touch in the list of changed tiddlers // Record the touch in the list of changed tiddlers
this.changedTiddlers = this.changedTiddlers || Object.create(null); this.changedTiddlers = this.changedTiddlers || Object.create(null);
this.changedTiddlers[title] = this.changedTiddlers[title] || Object.create(null); this.changedTiddlers[title] = this.changedTiddlers[title] || Object.create(null);
this.changedTiddlers[title][isDeleted ? "deleted" : "modified"] = true; this.changedTiddlers[title][isDeleted ? "deleted" : "modified"] = true;
this.changedTiddlers[title][isShadow ? "shadow" : "normal"] = true;
// Increment the change count // Increment the change count
this.changeCount = this.changeCount || Object.create(null); this.changeCount = this.changeCount || Object.create(null);
if($tw.utils.hop(this.changeCount,title)) { if($tw.utils.hop(this.changeCount,title)) {