diff options
Diffstat (limited to 'ext/js/data')
| -rw-r--r-- | ext/js/data/json-schema.js | 24 | ||||
| -rw-r--r-- | ext/js/data/permissions-util.js | 6 |
2 files changed, 14 insertions, 16 deletions
diff --git a/ext/js/data/json-schema.js b/ext/js/data/json-schema.js index 3342e387..9e1497e9 100644 --- a/ext/js/data/json-schema.js +++ b/ext/js/data/json-schema.js @@ -27,6 +27,8 @@ export class JsonSchemaError extends Error { */ constructor(message, valueStack, schemaStack) { super(message); + /** @type {string} */ + this.name = 'JsonSchemaError'; /** @type {import('ext/json-schema').ValueStackItem[]} */ this._valueStack = valueStack; /** @type {import('ext/json-schema').SchemaStackItem[]} */ @@ -371,18 +373,16 @@ export class JsonSchema { return {schema, stack: [{schema, path: null}]}; } const {prefixItems} = schema; - if (typeof prefixItems !== 'undefined') { - if (index >= 0 && index < prefixItems.length) { - const itemSchema = prefixItems[index]; - if (typeof itemSchema !== 'undefined') { - return { - schema: itemSchema, - stack: [ - {schema: prefixItems, path: 'prefixItems'}, - {schema: itemSchema, path: index} - ] - }; - } + if (typeof prefixItems !== 'undefined' && index >= 0 && index < prefixItems.length) { + const itemSchema = prefixItems[index]; + if (typeof itemSchema !== 'undefined') { + return { + schema: itemSchema, + stack: [ + {schema: prefixItems, path: 'prefixItems'}, + {schema: itemSchema, path: index} + ] + }; } } const {items} = schema; diff --git a/ext/js/data/permissions-util.js b/ext/js/data/permissions-util.js index 837b6d5f..097fe34d 100644 --- a/ext/js/data/permissions-util.js +++ b/ext/js/data/permissions-util.js @@ -113,10 +113,8 @@ export function getRequiredPermissionsForAnkiFieldValue(fieldValue) { export function hasRequiredPermissionsForOptions(permissions, options) { const permissionsSet = new Set(permissions.permissions); - if (!permissionsSet.has('nativeMessaging')) { - if (options.parsing.enableMecabParser) { - return false; - } + if (!permissionsSet.has('nativeMessaging') && options.parsing.enableMecabParser) { + return false; } if (!permissionsSet.has('clipboardRead')) { |