mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-03 06:49:58 +00:00
Code Issues Releases Wiki Activity

fix: nested functions should resolve filter run variables (#8233)

Browse Source
This commit is contained in:
Saq Imtiaz 2024-06-04 19:19:41 +02:00 committed by GitHub
parent 4860b14315
commit 33bc77f46f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,7 +316,8 @@ Widget.prototype.getStateQualifier = function(name) {
Make a fake widget with specified variables, suitable for variable lookup in filters Make a fake widget with specified variables, suitable for variable lookup in filters
*/ */
Widget.prototype.makeFakeWidgetWithVariables = function(variables) { Widget.prototype.makeFakeWidgetWithVariables = function(variables) {
var self = this; var self = this,
variables = variables || {};
return { return {
getVariable: function(name,opts) { getVariable: function(name,opts) {
if($tw.utils.hop(variables,name)) { if($tw.utils.hop(variables,name)) {
@ -334,7 +335,7 @@ Widget.prototype.makeFakeWidgetWithVariables = function(variables) {
}; };
} else { } else {
opts = opts || {}; opts = opts || {};
opts.variables = variables; opts.variables = $tw.utils.extend(variables,opts.variables);
return self.getVariableInfo(name,opts); return self.getVariableInfo(name,opts);
}; };
}, },

21
editions/test/tiddlers/tests/data/functions/FunctionFilterrunVariables3.tid Normal file
View File

@ -0,0 +1,21 @@
title: Functions/FunctionFilterrunVariables3
description: Nested functions in filter runs that set variables
type: text/vnd.tiddlywiki-multiple
tags: [[$:/tags/wiki-test-spec]]
title: Output
\whitespace trim
\define currentTiddler() old-current
\function .inner() [<currentTiddler>]
\function .outer() [<currentTiddler>match[intermediate2]then[new-current]] :map[function[.inner]]
\function .wrappertwo() [<currentTiddler>match[intermediate]addsuffix[2]] :map[function[.outer]]
\function .wrapper() intermediate :map[.wrappertwo[]]
<$text text={{{ [.wrapper[]] }}}/>
+
title: ExpectedResult
new-current