mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-10-01 16:30:46 +00:00
Code Issues Releases Wiki Activity

allowing variable number of arguments for non-argument macros

Browse Source
This commit is contained in:
Stephan Hradek 2013-12-11 22:59:52 +01:00
parent 489b40314b
commit 853cca906c
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/modules/widgets/widget.js
View File

@ -143,6 +143,7 @@ Widget.prototype.evaluateMacroModule = function(name,actualParams,defaultValue)
if($tw.utils.hop($tw.macros,name)) { if($tw.utils.hop($tw.macros,name)) {
var macro = $tw.macros[name], var macro = $tw.macros[name],
args = []; args = [];
if(macro.params.length > 0) {
var nextAnonParameter = 0, // Next candidate anonymous parameter in macro call var nextAnonParameter = 0, // Next candidate anonymous parameter in macro call
paramInfo, paramValue; paramInfo, paramValue;
// Step through each of the parameters in the macro definition // Step through each of the parameters in the macro definition
@ -167,6 +168,10 @@ Widget.prototype.evaluateMacroModule = function(name,actualParams,defaultValue)
// Save the parameter // Save the parameter
args.push(paramValue); args.push(paramValue);
} }
}
else for(var i=0; i<actualParams.length; ++i) {
args.push(actualParams[i].value);
}
return macro.run.apply(this,args) return macro.run.apply(this,args)
} else { } else {
return defaultValue; return defaultValue;