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

Fixed macro execution in renderTiddler and renderMacro

Browse Source
This commit is contained in:
Jeremy Ruston 2012-03-07 17:42:41 +00:00
parent b64e44d1af
commit a65713650e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/WikiStore.js
View File

@ -292,7 +292,9 @@ WikiStore.prototype.renderTiddler = function(targetType,tiddlerTitle,templateTit
{target: tiddlerTitle, template: templateTitle}, {target: tiddlerTitle, template: templateTitle},
null, null,
this); this);
macro.execute(); // Execute the macro
macro.execute([],this.getTiddler(tiddlerTitle));
// Render it
return macro.render(targetType); return macro.render(targetType);
}; };
@ -300,9 +302,9 @@ WikiStore.prototype.installMacro = function(macro) {
this.macros[macro.name] = macro; this.macros[macro.name] = macro;
}; };
WikiStore.prototype.renderMacro = function(macroName,params,children,tiddler) { WikiStore.prototype.renderMacro = function(macroName,params,children,tiddlerTitle) {
var macro = Renderer.MacroNode(macroName,params,children,this); var macro = Renderer.MacroNode(macroName,params,children,this);
macro.execute([],tiddler); macro.execute([],this.getTiddler(tiddlerTitle));
return macro; return macro;
}; };