summaryrefslogtreecommitdiff
path: root/ext/bg/js/dictionary-importer.js
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2020-08-15 17:23:09 -0400
committerGitHub <noreply@github.com>2020-08-15 17:23:09 -0400
commitd582c7a0f856c1a352992e3d16be319a891e0202 (patch)
treecb99ef132ca06ba82b10dfc528e0291f29195de1 /ext/bg/js/dictionary-importer.js
parentd8649f40d59356361ce470cc220dca6c62a66388 (diff)
JSON schema refactor (#731)
* Remove JsonSchema.clone * Move createProxy function * Group public properties first * Create private version of getPropertySchema * Mark functions as private * Use non-static getValidValueOrDefault * Mark private * Make public validate function not take an info parameter * Remove JsonSchema * Add isValid function * Use isValid for some tests * Fix incorrect type
Diffstat (limited to 'ext/bg/js/dictionary-importer.js')
-rw-r--r--ext/bg/js/dictionary-importer.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/bg/js/dictionary-importer.js b/ext/bg/js/dictionary-importer.js
index 4374ff40..535756f7 100644
--- a/ext/bg/js/dictionary-importer.js
+++ b/ext/bg/js/dictionary-importer.js
@@ -17,13 +17,14 @@
/* global
* JSZip
- * JsonSchema
+ * JsonSchemaValidator
* mediaUtility
*/
class DictionaryImporter {
constructor() {
this._schemas = new Map();
+ this._jsonSchemaValidator = new JsonSchemaValidator();
}
async importDictionary(dictionaryDatabase, archiveSource, details, onProgress) {
@@ -241,7 +242,7 @@ class DictionaryImporter {
_validateJsonSchema(value, schema, fileName) {
try {
- JsonSchema.validate(value, schema);
+ this._jsonSchemaValidator.validate(value, schema);
} catch (e) {
throw this._formatSchemaError(e, fileName);
}