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

Refactored macros to use new Dependencies() constructor

Browse Source
This commit is contained in:
Jeremy Ruston 2012-02-20 18:05:10 +00:00
parent b1a96d8bf5
commit b37d3b6670
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/macros/slider.js
View File

@ -38,15 +38,18 @@ exports.macro = {
}, },
execute: function(macroNode,tiddler,store) { execute: function(macroNode,tiddler,store) {
var isOpen = macroNode.params.state ? store.getTiddlerText(macroNode.params.state,"").trim() === "open" : true, var isOpen = macroNode.params.state ? store.getTiddlerText(macroNode.params.state,"").trim() === "open" : true,
target = macroNode.params.targetTiddler, target = macroNode.params.targetTiddler;
dependencies = new Dependencies();
dependencies.addDependency(target,true);
var content = Renderer.SliderNode(macroNode.params.state, var content = Renderer.SliderNode(macroNode.params.state,
macroNode.params.label ? macroNode.params.label : target, macroNode.params.label ? macroNode.params.label : target,
macroNode.params.tooltip, macroNode.params.tooltip,
isOpen, isOpen,
[ [
Renderer.MacroNode("tiddler",{target: target},null,dependencies,store) Renderer.MacroNode(
"tiddler",
{target: target},
null,
new Dependencies([],[target]),
store)
]); ]);
content.execute(macroNode.parents,tiddler); content.execute(macroNode.parents,tiddler);
return [content]; return [content];

24
js/macros/story.js
View File

@ -47,13 +47,11 @@ exports.macro = {
var tiddlers = parseStory(store.getTiddlerText(macroNode.params.story)), var tiddlers = parseStory(store.getTiddlerText(macroNode.params.story)),
content = []; content = [];
for(var t=0; t<tiddlers.length; t++) { for(var t=0; t<tiddlers.length; t++) {
var paramFn = {target: tiddlers[t],template: macroNode.params.template}, var m = Renderer.MacroNode("tiddler",
dependencies = new Dependencies(); {target: tiddlers[t],template: macroNode.params.template},
dependencies.addDependency(tiddlers[t],true); null,
if(macroNode.params.template) { new Dependencies([],[tiddlers[t],macroNode.params.template]),
dependencies.addDependency(macroNode.params.template,true); store);
}
var m = Renderer.MacroNode("tiddler",paramFn,null,dependencies,store);
m.execute(macroNode.parents,tiddler); m.execute(macroNode.parents,tiddler);
content.push(m); content.push(m);
} }
@ -82,13 +80,11 @@ exports.macro = {
var tiddlerNode = findTiddler(t,targetTiddlers[t],template); var tiddlerNode = findTiddler(t,targetTiddlers[t],template);
if(tiddlerNode === null) { if(tiddlerNode === null) {
// If not, render the tiddler // If not, render the tiddler
var paramFn = {target: targetTiddlers[t],template: template}, var m = Renderer.MacroNode("tiddler",
dependencies = new Dependencies(); {target: targetTiddlers[t],template: template},
dependencies.addDependency(targetTiddlers[t],true); null,
if(template) { new Dependencies([],[targetTiddlers[t],template]),
dependencies.addDependency(template,true); store);
}
var m = Renderer.MacroNode("tiddler",paramFn,null,dependencies,store);
m.execute(macroNode.parents,store.getTiddler(targetTiddlers[t])); m.execute(macroNode.parents,store.getTiddler(targetTiddlers[t]));
m.renderInDom(macroNode.domNode,macroNode.domNode.childNodes[t]); m.renderInDom(macroNode.domNode,macroNode.domNode.childNodes[t]);
macroNode.content.splice(t,0,m); macroNode.content.splice(t,0,m);

4
js/macros/view.js
View File

@ -31,12 +31,10 @@ exports.macro = {
if(v !== undefined) { if(v !== undefined) {
switch(macroNode.params.format) { switch(macroNode.params.format) {
case "link": case "link":
var dependencies = new Dependencies();
dependencies.addDependency(v,false);
var link = Renderer.MacroNode("link", var link = Renderer.MacroNode("link",
{target: v}, {target: v},
[Renderer.TextNode(v)], [Renderer.TextNode(v)],
dependencies, new Dependencies([v]),
store); store);
link.execute(parents,tiddler); link.execute(parents,tiddler);
return [link]; return [link];