diff --git a/js/WikiTextRules.js b/js/WikiTextRules.js index 482f3474f..2d887f33c 100755 --- a/js/WikiTextRules.js +++ b/js/WikiTextRules.js @@ -112,11 +112,12 @@ var parseMacroCall = function(w,name,paramString) { var macro = w.store.macros[name], params = {}; if(macro) { + if(macro.dependentAll) { + w.addDependency(null); + } var args = new ArgParser(paramString,{defaultName: "anon"}), insertParam = function(param,name,arg) { - if(param.dependantAll) { - w.addDependency(null); - } else if(param.type === "tiddler") { + if(param.type === "tiddler") { w.addDependency(arg.evaluated ? null : arg.string); } params[name] = {type: arg.evaluated ? "eval" : "string", value: arg.string}; diff --git a/js/macros/list.js b/js/macros/list.js index 7c323b7b3..a532e4d47 100644 --- a/js/macros/list.js +++ b/js/macros/list.js @@ -12,7 +12,7 @@ var utils = require("../Utils.js"); exports.macro = { name: "list", types: ["text/html","text/plain"], - dependantAll: true, // Tiddlers containing <> macro are dependent on every tiddler + dependentAll: true, // Tiddlers containing <> macro are dependent on every tiddler params: { type: {byName: "default", type: "text", optional: false}, template: {byName: true, type: "tiddler", optional: true},