mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-25 17:40:29 +00:00
Code Issues Releases Wiki Activity

Renamed the templateTitle parameter of the transclude macro for consistency with the tiddler macro

Browse Source
This commit is contained in:
Jeremy Ruston 2012-10-15 19:02:49 +01:00
parent 1c699c7118
commit 62fac05411
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/modules/macros/transclude.js
View File

@ -18,7 +18,7 @@ exports.info = {
params: { params: {
filter: {byPos: 0, type: "filter"}, filter: {byPos: 0, type: "filter"},
title: {byPos: 1, type: "tiddler"}, title: {byPos: 1, type: "tiddler"},
templateTitle: {byName: true, type: "tiddler"}, template: {byName: true, type: "tiddler"},
templateText: {byName: true, type: "text"}, templateText: {byName: true, type: "text"},
emptyMessage: {byName: true, type: "text"} emptyMessage: {byName: true, type: "text"}
} }
@ -46,13 +46,13 @@ exports.getTemplateParseTree = function(parents) {
// Parse the template // Parse the template
return this.wiki.parseText("text/x-tiddlywiki",this.params.templateText); return this.wiki.parseText("text/x-tiddlywiki",this.params.templateText);
} else { } else {
if(this.hasParameter("templateTitle")) { if(this.hasParameter("template")) {
// Check for recursion // Check for recursion
if(parents.indexOf(this.params.templateTitle) !== -1) { if(parents.indexOf(this.params.template) !== -1) {
return $tw.Tree.errorNode("Tiddler recursion error in <<transclude>> macro"); return $tw.Tree.errorNode("Tiddler recursion error in <<transclude>> macro");
} }
parents.push(this.params.templateTitle); parents.push(this.params.template);
return this.wiki.parseTiddler(this.params.templateTitle); return this.wiki.parseTiddler(this.params.template);
} else { } else {
return this.wiki.parseText("text/x-tiddlywiki","<<view text wikified>>"); return this.wiki.parseText("text/x-tiddlywiki","<<view text wikified>>");
} }
@ -101,7 +101,7 @@ exports.refreshInDom = function(changes) {
console.log("Refreshing transclude macro",this.params.filter,this.tiddlerTitle); console.log("Refreshing transclude macro",this.params.filter,this.tiddlerTitle);
var doRefresh = false; var doRefresh = false;
// Do a refresh if any of our parameters have changed // Do a refresh if any of our parameters have changed
doRefresh = doRefresh || (this.hasParameter("templateTitle") && $tw.utils.hop(changes,this.params.templateTitle)); doRefresh = doRefresh || (this.hasParameter("template") && $tw.utils.hop(changes,this.params.template));
// Check if we need to do a full refresh // Check if we need to do a full refresh
if(doRefresh) { if(doRefresh) {
// Re-execute the macro to refresh it // Re-execute the macro to refresh it