mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix note template condition evaluating to true on empty array

Browse source 
Fixes #2386
This commit is contained in:
Martynas Bagdonas 2022-03-11 17:04:47 +02:00
parent ef82becf00
commit 78e1e8593a
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
chrome/content/zotero/xpcom/utilities_internal.js
View file

@ -2228,7 +2228,15 @@ Zotero.Utilities.Internal = {
} }
if (['if', 'elseif'].includes(operator)) { if (['if', 'elseif'].includes(operator)) {
if (!level.executed) { if (!level.executed) {
level.condition = level.parentCondition && (args[2] ? vars[args[0]].toLowerCase() == args[2].toLowerCase() : !!vars[args[0]]); level.condition = level.parentCondition && (
args[2]
? vars[args[0]].toLowerCase() == args[2].toLowerCase()
: (
Array.isArray(vars[args[0]])
? !!vars[args[0]].length
: !!vars[args[0]]
)
);
level.executed = level.condition; level.executed = level.condition;
} }
else { else {

7
test/tests/utilities_internalTest.js
View file

@ -529,11 +529,14 @@ describe("Zotero.Utilities.Internal", function () {
v1: '1', v1: '1',
v2: (pars) => pars.a1 + pars.a2 + pars.a3, v2: (pars) => pars.a1 + pars.a2 + pars.a3,
v3: () => undefined, v3: () => undefined,
ar1: [],
ar2: [1, 2]
}; };
var template = `{{ v1}}{{v2 a1= 1 a2 =' 2' a3 = "3 "}}{{v3}}{{v4}}`; var template = `{{ v1}}{{v2 a1= 1 a2 =' 2' a3 = "3 "}}{{v3}}{{v4}}{{if ar1}}ar1{{endif}}{{if ar2}}{{ar2}}{{endif}}`;
var html = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars); var html = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars);
assert.equal(html, '11 23 '); assert.equal(html, '11 23 1,2');
}); });
it("should support nested 'if' statements", function () { it("should support nested 'if' statements", function () {
var vars = { var vars = {
v1: '1', v1: '1',