mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-09-30 16:00:46 +00:00
Code Issues Releases Wiki Activity

Added indirect transclusion

Browse Source 
The name of the tiddler to transclude is taken from a text reference
This commit is contained in:
Jeremy Ruston 2012-11-07 16:11:47 +00:00
parent bdc46a8bc3
commit 34435329e6
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/modules/macros/tiddler.js
View File

@ -56,6 +56,7 @@ exports.info = {
cascadeParams: true, // Cascade names of named parameters to following anonymous parameters cascadeParams: true, // Cascade names of named parameters to following anonymous parameters
params: { params: {
target: {byName: "default", type: "tiddler"}, target: {byName: "default", type: "tiddler"},
targetVia: {byName: true, type: "tiddler"},
template: {byName: true, type: "tiddler"}, template: {byName: true, type: "tiddler"},
templateText: {byName: true, type: "text"}, templateText: {byName: true, type: "text"},
"with": {byName: true, type: "text", dependentAll: true} "with": {byName: true, type: "text", dependentAll: true}
@ -73,6 +74,12 @@ exports.evaluateDependencies = function() {
} else { } else {
dependencies.addDependency(template,true); dependencies.addDependency(template,true);
} }
var targetVia = this.srcParams.targetVia;
if(typeof targetVia === "function") {
dependencies.dependentAll = true;
} else {
dependencies.addDependency(targetVia,true);
}
return dependencies; return dependencies;
}; };
@ -85,6 +92,8 @@ exports.executeMacro = function() {
// If there's no render title specified then use the current tiddler title // If there's no render title specified then use the current tiddler title
if(this.hasParameter("target")) { if(this.hasParameter("target")) {
renderTitle = this.params.target; renderTitle = this.params.target;
} else if(this.hasParameter("targetVia")) {
renderTitle = this.wiki.getTextReference(this.params.targetVia,null,this.tiddlerTitle);
} else { } else {
renderTitle = this.tiddlerTitle; renderTitle = this.tiddlerTitle;
} }