mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-07-04 11:13:15 +00:00
Code Issues Releases Wiki Activity

Refactored hasParameter() call

Browse Source
This commit is contained in:
Jeremy Ruston 2012-05-02 17:26:06 +01:00
parent 5aaa00eee5
commit 96fd935f34
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rabbithole/core/modules/macros/tiddler.js
View File

@ -87,11 +87,11 @@ exports.executeMacro = function() {
if(parents.indexOf(renderTemplate) !== -1) { if(parents.indexOf(renderTemplate) !== -1) {
children = [$tw.Tree.errorNode("Tiddler recursion error in <<tiddler>> macro")]; children = [$tw.Tree.errorNode("Tiddler recursion error in <<tiddler>> macro")];
} else { } else {
if("with" in this.params) { if(this.hasParameter("with")) {
// Parameterised transclusion // Parameterised transclusion
var targetTiddler = this.wiki.getTiddler(renderTemplate), var targetTiddler = this.wiki.getTiddler(renderTemplate),
text = targetTiddler.fields.text; text = targetTiddler.fields.text;
var withTokens = [this.params["with"]]; var withTokens = [this.params["with"]]; // TODO: Allow for more than one with: parameter
for(t=0; t<withTokens.length; t++) { for(t=0; t<withTokens.length; t++) {
var placeholderRegExp = new RegExp("\\$"+(t+1),"mg"); var placeholderRegExp = new RegExp("\\$"+(t+1),"mg");
text = text.replace(placeholderRegExp,withTokens[t]); text = text.replace(placeholderRegExp,withTokens[t]);