mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2024-12-12 11:10:27 +00:00
Introduce function operator for calling functions
Can invoke any functions, not just those start with a period. And can pass zero parameters (in contrast when invoked as a custom filter operator there's no way to omit the first parameter).
This commit is contained in:
parent
bd9d7c3d6a
commit
3af2cc2691
45
core/modules/filters/function.js
Normal file
45
core/modules/filters/function.js
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
/*\
|
||||||
|
title: $:/core/modules/filters/function.js
|
||||||
|
type: application/javascript
|
||||||
|
module-type: filteroperator
|
||||||
|
|
||||||
|
Filter operator returning those input titles that are returned from a function
|
||||||
|
|
||||||
|
\*/
|
||||||
|
(function(){
|
||||||
|
|
||||||
|
/*jslint node: true, browser: true */
|
||||||
|
/*global $tw: false */
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
/*
|
||||||
|
Export our filter function
|
||||||
|
*/
|
||||||
|
exports.function = function(source,operator,options) {
|
||||||
|
var functionName = operator.operands[0],
|
||||||
|
customDefinition = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(functionName);
|
||||||
|
if(customDefinition && customDefinition.srcVariable && customDefinition.srcVariable.isFunctionDefinition) {
|
||||||
|
var variables = Object.create(null);
|
||||||
|
// Go through each of the defined parameters, and make a variable with the value of the corresponding operand
|
||||||
|
$tw.utils.each(customDefinition.srcVariable.params,function(param,index) {
|
||||||
|
var value = operator.operands[1 + index]; // Skip over the first operand that gives the function name
|
||||||
|
variables[param.name] = value === undefined ? param["default"] || "" : value;
|
||||||
|
});
|
||||||
|
var list = options.wiki.filterTiddlers(customDefinition.srcVariable.value,options.widget.makeFakeWidgetWithVariables(variables),source);
|
||||||
|
if(operator.prefix === "!") {
|
||||||
|
var results = [];
|
||||||
|
source(function(tiddler,title) {
|
||||||
|
if(list.indexOf(title) === -1) {
|
||||||
|
results.push(title);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return results;
|
||||||
|
} else {
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Return an empty list if the function wasn't found
|
||||||
|
return [];
|
||||||
|
};
|
||||||
|
|
||||||
|
})();
|
@ -13,8 +13,12 @@ title: Output
|
|||||||
<$text text={{{ [[123].multiplybysomething[]] }}}/>
|
<$text text={{{ [[123].multiplybysomething[]] }}}/>
|
||||||
-
|
-
|
||||||
<$text text={{{ [[123].multiplybysomething[x],[4]] }}}/>
|
<$text text={{{ [[123].multiplybysomething[x],[4]] }}}/>
|
||||||
|
|
|
||||||
|
<$text text={{{ [[123]function[.multiplybysomething]] }}}/>
|
||||||
|
-
|
||||||
|
<$text text={{{ [[123]function[.multiplybysomething],[x],[4]] }}}/>
|
||||||
|
|
||||||
+
|
+
|
||||||
title: ExpectedResult
|
title: ExpectedResult
|
||||||
|
|
||||||
<p>492-984</p>
|
<p>492-984|492-984</p>
|
@ -5,12 +5,17 @@ tags: [[$:/tags/wiki-test-spec]]
|
|||||||
|
|
||||||
title: Output
|
title: Output
|
||||||
|
|
||||||
|
\whitespace trim
|
||||||
|
|
||||||
\function .multiplybytwo()
|
\function .multiplybytwo()
|
||||||
[multiply[2]]
|
[multiply[2]]
|
||||||
\end
|
\end
|
||||||
|
|
||||||
<$text text={{{ [[123].multiplybytwo[]] }}}/>
|
<$text text={{{ [[123].multiplybytwo[]] }}}/>
|
||||||
|
|
|
||||||
|
<$text text={{{ [[123]function[.multiplybytwo]] }}}/>
|
||||||
|
|
||||||
+
|
+
|
||||||
title: ExpectedResult
|
title: ExpectedResult
|
||||||
|
|
||||||
<p>246</p>
|
<p>246|246</p>
|
Loading…
Reference in New Issue
Block a user