Made constants work in calculations performed after recomputation
This commit is contained in:
@@ -13,23 +13,22 @@ export default function applyToggle({
|
||||
if (Number.isFinite(+prop.condition)){
|
||||
return !!+prop.condition;
|
||||
}
|
||||
try {
|
||||
var {result, errors} = evaluateString(prop.condition, scope, 'reduce');
|
||||
if (typeof result !== 'number' && typeof result !== 'boolean') {
|
||||
log.content.push({
|
||||
error: errors.join(', '),
|
||||
});
|
||||
return false;
|
||||
}
|
||||
var {result} = evaluateString({
|
||||
string: prop.condition,
|
||||
scope,
|
||||
fn: 'reduce'
|
||||
});
|
||||
if (result.constructor.name === 'ErrorNode') {
|
||||
log.content.push({
|
||||
name: prop.name,
|
||||
resultPrefix: prop.condition + ' = ',
|
||||
result,
|
||||
});
|
||||
return !!result;
|
||||
} catch (e){
|
||||
log.content.push({
|
||||
error: e.toString(),
|
||||
name: 'Toggle error',
|
||||
error: result.toString(),
|
||||
});
|
||||
return false;
|
||||
}
|
||||
log.content.push({
|
||||
name: prop.name || 'Toggle',
|
||||
resultPrefix: prop.condition + ' = ',
|
||||
result: result.toString(),
|
||||
});
|
||||
return !!result.value;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user