clone/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/TiddlyWiki/TiddlyWiki5.git synced 2026-05-01 12:07:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduced new Dependency() class to encapsulate dependency handling logic

Browse Source 
Note that the format is now slightly different; see js/Dependencies.js
for details
This commit is contained in:
Jeremy Ruston
2012-02-17 14:11:25 +00:00
parent 8d4d168432
commit 103a9a4d7f
11 changed files with 87 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/WikiTextRules.js
View File

@@ -9,6 +9,7 @@ title: js/WikiTextRules.js
var ArgParser = require("./ArgParser.js").ArgParser,
Renderer = require("./Renderer.js").Renderer,
Dependencies = require("./Dependencies.js").Dependencies,
util = require("util");
var textPrimitives = {
@@ -131,7 +132,7 @@ var compileMacroParams = function(w,params) {
var insertMacroCall = function(w,output,name,params,children) {
var macro = w.store.macros[name],
dependencies = {};
dependencies = new Dependencies();
if(macro) {
if(macro.dependentAll) {
dependencies.dependentAll = true;
@@ -143,21 +144,12 @@ var insertMacroCall = function(w,output,name,params,children) {
if(params[m].type === "eval") {
dependencies.dependentAll = true;
} else {
var rel = param.rel || "include",
target = params[m].value;
if(!(rel in dependencies)) {
dependencies[rel] = {};
}
if(dependencies[rel][target]) {
dependencies[rel][target]++;
} else {
dependencies[rel][target] = 1;
}
dependencies.addDependency(params[m].value,param.skinny);
}
}
}
}
w.mergeDependencies(dependencies);
w.dependencies.mergeDependencies(dependencies);
output.push(Renderer.MacroNode(name,compileMacroParams(w,params),children,dependencies,w.store));
}
};