mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-30 05:19:57 +00:00
Code Issues Releases Wiki Activity

Fix/self transclude (#8254)

Browse Source 
* fix: ignore empty tiddler param when extract transcludes

* test: about self transclude
This commit is contained in:
lin onetwo 2024-06-12 16:39:43 +08:00 committed by GitHub
parent d276e0aa25
commit 32cbc97a0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 72 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/wiki.js
View File

@ -567,7 +567,7 @@ exports.extractTranscludes = function(parseTreeRoot) {
} else {
value = parseTreeNode.attributes.$tiddler.value;
}
if(transcludes.indexOf(value) === -1) {
if(transcludes.indexOf(value) === -1 && value !== undefined) {
transcludes.push(value);
}
}

72
editions/test/tiddlers/tests/test-backtranscludes.js
View File

@ -11,7 +11,7 @@ Tests the backtranscludes mechanism.
/*global $tw: false */
"use strict";
describe('Backtranscludes tests', function() {
describe('Backtranscludes and transclude filter tests', function() {
describe('a tiddler with no transcludes to it', function() {
var wiki = new $tw.Wiki();
@ -56,6 +56,26 @@ describe('Backtranscludes tests', function() {
});
});
describe('A data tiddler transclude will still use the tiddler as result.', function() {
var wiki = new $tw.Wiki();
wiki.addTiddler({
title: 'TestIncoming',
type: 'application/x-tiddler-dictionary',
text: 'name: value'});
wiki.addTiddler({
title: 'TestOutgoing',
text: 'A transclude to {{TestIncoming##name}}'});
it('should have a backtransclude', function() {
expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
});
it('should have a transclude', function() {
expect(wiki.filterTiddlers('TestOutgoing +[transcludes[]]').join(',')).toBe('TestIncoming');
});
});
describe('A tiddler that has a transclude added to it later', function() {
it('should have an additional backtransclude', function() {
var wiki = new $tw.Wiki();
@ -143,6 +163,56 @@ describe('Backtranscludes tests', function() {
expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('');
});
});
describe('a tiddler with some transcludes on it in order', function() {
var wiki = new $tw.Wiki();
wiki.addTiddler({
title: 'TestOutgoing',
text: "{{New Tiddler!!created}}\n\nA transclude to {{TestIncoming}}"
});
it('should have a transclude', function() {
expect(wiki.filterTiddlers('TestOutgoing +[transcludes[]]').join(',')).toBe('New Tiddler,TestIncoming');
});
it('should have a back transclude', function() {
expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
expect(wiki.filterTiddlers('[[New Tiddler]] +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
});
});
describe('ignore self transclusion', function() {
var wiki = new $tw.Wiki();
wiki.addTiddler({
title: 'TestOutgoing',
text: "{{!!created}}\n\nA transclude to {{!!title}}"});
it('should have no transclude', function() {
expect(wiki.filterTiddlers('TestOutgoing +[transcludes[]]').join(',')).toBe('');
});
it('should have no back transcludes', function() {
expect(wiki.filterTiddlers('TestOutgoing +[backtranscludes[]]').join(',')).toBe('');
});
});
describe('recognize soft transclusion defined by widget', function() {
var wiki = new $tw.Wiki();
wiki.addTiddler({
title: 'TestOutgoing',
text: "<$tiddler tiddler='TestIncoming'><$transclude $tiddler /></$tiddler>"});
it('should have a transclude', function() {
expect(wiki.filterTiddlers('TestOutgoing +[transcludes[]]').join(',')).toBe('TestIncoming');
});
it('should have a back transclude', function() {
expect(wiki.filterTiddlers('TestIncoming +[backtranscludes[]]').join(',')).toBe('TestOutgoing');
});
});
});
})();