alex/yomichan
1
Fork 0
Code Releases Activity

Fix conditional logic

Browse Source
This commit is contained in:
toasted-nutbread 2020-02-02 10:17:16 -05:00
parent 964db74108
commit 7c9fe2c6cf
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ext/bg/js/json-schema.js
View File

@ -199,17 +199,19 @@ class JsonSchemaProxyHandler {
} }
static validateConditional(value, schema) { static validateConditional(value, schema) {
const ifCondition = schema.if; const ifSchema = schema.if;
if (!JsonSchemaProxyHandler.isObject(ifCondition)) { return; } if (!JsonSchemaProxyHandler.isObject(ifSchema)) { return; }
const thenSchema = schema.then; let okay = true;
if (JsonSchemaProxyHandler.isObject(thenSchema)) { try {
JsonSchemaProxyHandler.validate(value, thenSchema); JsonSchemaProxyHandler.validate(value, thenSchema);
} catch (e) {
okay = false;
} }
const elseSchema = schema.else; const nextSchema = okay ? schema.then : schema.else;
if (JsonSchemaProxyHandler.isObject(elseSchema)) { if (JsonSchemaProxyHandler.isObject(nextSchema)) {
JsonSchemaProxyHandler.validate(value, thenSchema); JsonSchemaProxyHandler.validate(value, nextSchema);
} }
} }