mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-10-27 21:57:39 +00:00
Code Issues Releases Wiki Activity

Added support for macros to evaluate their own dependencies

Browse Source
This commit is contained in:
Jeremy Ruston
2012-03-30 13:48:30 +01:00
parent 8f3fcda234
commit 1df0a50760
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
js/Renderer.js
View File

@@ -99,26 +99,37 @@ MacroNode.prototype = new Node();
MacroNode.prototype.constructor = MacroNode; MacroNode.prototype.constructor = MacroNode;
/* /*
Evaluate the dependencies of this macro invocation by examining the macro parameters Evaluate the dependencies of this macro invocation. If the macro provides an `evaluateDependencies` method
then it is invoked to evaluate the dependencies. Otherwise it generates the dependencies based on the
macro parameters provided
*/ */
MacroNode.prototype.evaluateDependencies = function() { MacroNode.prototype.evaluateDependencies = function() {
var dependencies = new Dependencies();
if(this.srcParams && this.macro) { if(this.srcParams && this.macro) {
if(this.macro.dependentAll) { if(this.macro.evaluateDependencies) {
dependencies.dependentAll = true; // Call the evaluateDependencies method if the macro provides it
} return this.macro.evaluateDependencies.call(this);
for(var m in this.macro.params) { } else {
var paramInfo = this.macro.params[m]; // Figure out the dependencies from the metadata and parameters
if(m in this.srcParams && paramInfo.type === "tiddler") { var dependencies = new Dependencies();
if(typeof this.srcParams[m] === "function") { if(this.macro.dependentAll) {
dependencies.dependentAll = true; dependencies.dependentAll = true;
} else { }
dependencies.addDependency(this.srcParams[m],!paramInfo.skinny); if(this.macro.dependentOnContextTiddler) {
dependencies.dependentOnContextTiddler = true;
}
for(var m in this.macro.params) {
var paramInfo = this.macro.params[m];
if(m in this.srcParams && paramInfo.type === "tiddler") {
if(typeof this.srcParams[m] === "function") {
dependencies.dependentAll = true;
} else {
dependencies.addDependency(this.srcParams[m],!paramInfo.skinny);
}
} }
} }
return dependencies;
} }
} }
return dependencies;
}; };
MacroNode.prototype.parseMacroParamString = function(paramString) { MacroNode.prototype.parseMacroParamString = function(paramString) {
@@ -263,7 +274,7 @@ MacroNode.prototype.refresh = function(changes) {
var t, var t,
self = this; self = this;
// Check if any of the dependencies of this macro node have changed // Check if any of the dependencies of this macro node have changed
if(this.dependencies.hasChanged(changes)) { if(this.dependencies.hasChanged(changes,this.tiddlerTitle)) {
// Re-execute the macro if so // Re-execute the macro if so
this.execute(this.parents,this.tiddlerTitle); this.execute(this.parents,this.tiddlerTitle);
} else { } else {
@@ -278,7 +289,7 @@ MacroNode.prototype.refreshInDom = function(changes) {
var t, var t,
self = this; self = this;
// Check if any of the dependencies of this macro node have changed // Check if any of the dependencies of this macro node have changed
if(this.dependencies.hasChanged(changes)) { if(this.dependencies.hasChanged(changes,this.tiddlerTitle)) {
// Ask the macro to rerender itself if it can // Ask the macro to rerender itself if it can
if(this.macro.refreshInDom) { if(this.macro.refreshInDom) {
this.macro.refreshInDom.call(this,changes); this.macro.refreshInDom.call(this,changes);