diff --git a/core/modules/filters.js b/core/modules/filters.js index 57009afad..7c8cb21ba 100644 --- a/core/modules/filters.js +++ b/core/modules/filters.js @@ -230,8 +230,8 @@ exports.getFilterRunPrefixes = function() { return this.filterRunPrefixes; } -exports.filterTiddlers = function(filterString,widget,source,options) { - var fn = this.compileFilter(filterString,options); +exports.filterTiddlers = function(filterString,widget,source) { + var fn = this.compileFilter(filterString); try { const fnResult = fn.call(this,source,widget); return fnResult; @@ -244,11 +244,8 @@ exports.filterTiddlers = function(filterString,widget,source,options) { Compile a filter into a function with the signature fn(source,widget) where: source: an iterator function for the source tiddlers, called source(iterator), where iterator is called as iterator(tiddler,title) widget: an optional widget node for retrieving the current tiddler etc. -options: optional hashmap of options - options.defaultFilterRunPrefix: the default filter run prefix to use when none is specified */ -exports.compileFilter = function(filterString,options) { - var defaultFilterRunPrefix = options?.defaultFilterRunPrefix || "or"; +exports.compileFilter = function(filterString) { if(!this.filterCache) { this.filterCache = Object.create(null); this.filterCacheCount = 0; @@ -357,7 +354,7 @@ exports.compileFilter = function(filterString,options) { var options = {wiki: self, suffixes: operation.suffixes || []}; switch(operation.prefix || "") { case "": // No prefix means that the operation is unioned into the result - return filterRunPrefixes[defaultFilterRunPrefix](operationSubFunction, options); + return filterRunPrefixes["or"](operationSubFunction, options); case "=": // The results of the operation are pushed into the result without deduplication return filterRunPrefixes["all"](operationSubFunction, options); case "-": // The results of this operation are removed from the main result diff --git a/core/modules/filters/subfilter.js b/core/modules/filters/subfilter.js index c7853798e..5e35f7cd1 100644 --- a/core/modules/filters/subfilter.js +++ b/core/modules/filters/subfilter.js @@ -13,9 +13,7 @@ Filter operator returning its operand evaluated as a filter Export our filter function */ exports.subfilter = function(source,operator,options) { - var suffixes = operator.suffixes || [], - defaultFilterRunPrefix = (suffixes[0] || [])[0] || "or"; - var list = options.wiki.filterTiddlers(operator.operand,options.widget,source,{defaultFilterRunPrefix}); + var list = options.wiki.filterTiddlers(operator.operand,options.widget,source); if(operator.prefix === "!") { var results = []; source(function(tiddler,title) {