From 50e0fbbb662230a3a9f6e7354c229200bd1a03a2 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Thu, 28 Nov 2019 15:18:27 -0500 Subject: [PATCH] Use schema to validate options --- ext/bg/background.html | 1 + ext/bg/js/backend.js | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/ext/bg/background.html b/ext/bg/background.html index 4c6f8795..af87eddb 100644 --- a/ext/bg/background.html +++ b/ext/bg/background.html @@ -31,6 +31,7 @@ + diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js index 1a874dc8..55841cd6 100644 --- a/ext/bg/js/backend.js +++ b/ext/bg/js/backend.js @@ -23,6 +23,7 @@ class Backend { this.anki = new AnkiNull(); this.mecab = new Mecab(); this.options = null; + this.optionsSchema = null; this.optionsContext = { depth: 0, url: window.location.href @@ -38,7 +39,16 @@ class Backend { async prepare() { await this.translator.prepare(); + + this.optionsSchema = await requestJson(chrome.runtime.getURL('/bg/data/options-schema.json'), 'GET'); this.options = await optionsLoad(); + try { + this.options = JsonSchema.getValidValueOrDefault(this.optionsSchema, this.options); + } catch (e) { + // This shouldn't happen, but catch errors just in case of bugs + logError(e); + } + this.onOptionsUpdated('background'); if (chrome.commands !== null && typeof chrome.commands === 'object') {