mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-02-02 12:19:11 +00:00
Code Issues Releases Wiki Activity

Refactored the story macro to invoke the tiddler macro to display tiddlers

Browse Source
This commit is contained in:
Jeremy Ruston 2012-01-24 18:11:38 +00:00
parent 3268c46458
commit 04e9376eca
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/macros/story.js
View File

@ -13,8 +13,8 @@ exports.macro = {
name: "story",
types: ["text/html","text/plain"],
params: {
story: {byName: "default", type: "text", optional: false},
template: {byName: true, type: "text", optional: true}
story: {byName: "default", type: "tiddler", optional: false},
template: {byName: true, type: "tiddler", optional: true}
},
handler: function(type,tiddler,store,params) {
var tiddlers = store.getTiddlerText(params.story).split("\n"),
@ -23,13 +23,21 @@ exports.macro = {
for(t=0; t<tiddlers.length; t++) {
var title = tiddlers[t].trim();
if(title !== "") {
output.push("<article>");
if(params.template) {
output.push(store.renderTiddler(type,params.template,title));
output.push(store.renderMacro("tiddler",
type,
store.getTiddler(title),
{
target: params.template
}));
} else {
output.push(store.renderTiddler(type,title));
output.push(store.renderMacro("tiddler",
type,
store.getTiddler(title),
{
target: title
}));
}
output.push("</article>");
}
}
return output.join("\n");