From 9ef1c83cf937363a73d4af66507fa54a3fca2f20 Mon Sep 17 00:00:00 2001 From: Peter Bjerg Lidegaard Date: Mon, 27 Feb 2023 20:42:32 +0100 Subject: [PATCH] Renamed variable to not clash with const function --- ADnD_2E_Revised/2ESheet.html | 8 ++++---- ADnD_2E_Revised/javascript/sheetWorkers.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ADnD_2E_Revised/2ESheet.html b/ADnD_2E_Revised/2ESheet.html index 4320e6da3c..4a6a6f7b7e 100644 --- a/ADnD_2E_Revised/2ESheet.html +++ b/ADnD_2E_Revised/2ESheet.html @@ -68740,7 +68740,7 @@ const checkClassLevel = async function(values, rollExpression) { } } -const calculateFormula = function(formulaField, calculatedField, checkClassLevel) { +const calculateFormula = function(formulaField, calculatedField, checkLevel) { getAttrs([formulaField, ...Object.entries(LEVEL_FIELDS).flat()], async function (values) { let rollExpression = values[formulaField]; let valid = isRollValid(rollExpression, formulaField); @@ -68748,7 +68748,7 @@ const calculateFormula = function(formulaField, calculatedField, checkClassLevel return; let valueToSet = {}; - if (checkClassLevel) { + if (checkLevel) { valueToSet[formulaField] = await checkClassLevel(values, rollExpression); } @@ -69391,8 +69391,8 @@ CALCULATION_FIELDS.forEach(({formulaField, calculatedField}) => { if (isSheetWorkerUpdate(eventInfo)) return; - let checkClassLevel = !!eventInfo.newValue; - calculateFormula(formulaField, calculatedField, checkClassLevel); + let checkLevel = !!eventInfo.newValue; + calculateFormula(formulaField, calculatedField, checkLevel); }); }); diff --git a/ADnD_2E_Revised/javascript/sheetWorkers.js b/ADnD_2E_Revised/javascript/sheetWorkers.js index 2fe94dfa19..d86b1daeed 100644 --- a/ADnD_2E_Revised/javascript/sheetWorkers.js +++ b/ADnD_2E_Revised/javascript/sheetWorkers.js @@ -227,7 +227,7 @@ const checkClassLevel = async function(values, rollExpression) { } } -const calculateFormula = function(formulaField, calculatedField, checkClassLevel) { +const calculateFormula = function(formulaField, calculatedField, checkLevel) { getAttrs([formulaField, ...Object.entries(LEVEL_FIELDS).flat()], async function (values) { let rollExpression = values[formulaField]; let valid = isRollValid(rollExpression, formulaField); @@ -235,7 +235,7 @@ const calculateFormula = function(formulaField, calculatedField, checkClassLevel return; let valueToSet = {}; - if (checkClassLevel) { + if (checkLevel) { valueToSet[formulaField] = await checkClassLevel(values, rollExpression); } @@ -878,8 +878,8 @@ CALCULATION_FIELDS.forEach(({formulaField, calculatedField}) => { if (isSheetWorkerUpdate(eventInfo)) return; - let checkClassLevel = !!eventInfo.newValue; - calculateFormula(formulaField, calculatedField, checkClassLevel); + let checkLevel = !!eventInfo.newValue; + calculateFormula(formulaField, calculatedField, checkLevel); }); });