mirrors/TiddlyWiki5
1
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5.git synced 2025-12-15 15:10:30 -08:00
Code Issues Projects Releases Packages Wiki Activity

Minor improvement to filter code (#9054)

Browse source
This commit is contained in:
Cameron Fischer 2025-06-03 12:33:34 -04:00 • committed by GitHub
parent 05db1bcb2c
commit 8837a0f405
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/modules/filters.js
View file

@ -248,8 +248,7 @@ exports.compileFilter = function(filterString) {
// Create a function for the chain of operators in the operation // Create a function for the chain of operators in the operation
var operationSubFunction = function(source,widget) { var operationSubFunction = function(source,widget) {
var accumulator = source, var accumulator = source,
results = [], results = [];
currTiddlerTitle = widget && widget.getVariable("currentTiddler");
$tw.utils.each(operation.operators,function(operator) { $tw.utils.each(operation.operators,function(operator) {
var operands = [], var operands = [],
operatorFunction; operatorFunction;
@ -265,6 +264,7 @@ exports.compileFilter = function(filterString) {
} }
$tw.utils.each(operator.operands,function(operand) { $tw.utils.each(operator.operands,function(operand) {
if(operand.indirect) { if(operand.indirect) {
var currTiddlerTitle = widget && widget.getVariable("currentTiddler");
operand.value = self.getTextReference(operand.text,"",currTiddlerTitle); operand.value = self.getTextReference(operand.text,"",currTiddlerTitle);
} else if(operand.variable) { } else if(operand.variable) {
var varTree = $tw.utils.parseFilterVariable(operand.text); var varTree = $tw.utils.parseFilterVariable(operand.text);

9
editions/test/tiddlers/tests/test-filters.js
View file

@ -1139,6 +1139,15 @@ Tests the filtering mechanism.
// Non string properties should get toStringed. // Non string properties should get toStringed.
expect(wiki.filterTiddlers("[[$:/core/modules/commands/init.js]moduleproperty[info]]").join(" ")).toBe('{"name":"init","synchronous":true}'); expect(wiki.filterTiddlers("[[$:/core/modules/commands/init.js]moduleproperty[info]]").join(" ")).toBe('{"name":"init","synchronous":true}');
}); });
it("should minimize unnecessary variable lookup", function() {
var widget = wiki.makeWidget();
var getVar = spyOn(widget, "getVariableInfo").and.callThrough();
expect(wiki.filterTiddlers("[all[]prefix[anything]]", widget).length).toBe(0);
// We didn't use any indirect operands or variables.
// No variable lookup should have occurred.
expect(getVar).not.toHaveBeenCalled();
});
} }
}); });