alex/yomichan
1
Fork 0
Code Releases Activity

Add some validation to options loading

Browse Source
This commit is contained in:
toasted-nutbread 2019-09-05 20:35:04 -04:00
parent 1c767711bb
commit ec110fa1b7
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ext/bg/js/options.js
View File

@ -323,10 +323,23 @@ function optionsVersion(options) {
function optionsLoad() {
return new Promise((resolve, reject) => {
chrome.storage.local.get(null, store => resolve(store.options));
chrome.storage.local.get(['options'], store => {
const error = chrome.runtime.lastError;
if (error) {
reject(error);
} else {
resolve(store.options);
}
});
}).then(optionsStr => {
return optionsStr ? JSON.parse(optionsStr) : {};
}).catch(error => {
if (typeof optionsStr === 'string') {
const options = JSON.parse(optionsStr);
if (typeof options === 'object' && options !== null && !Array.isArray(options)) {
return options;
}
}
return {};
}).catch(() => {
return {};
}).then(options => {
return optionsVersion(options);
@ -334,7 +347,7 @@ function optionsLoad() {
}
function optionsSave(options) {
return new Promise((resolve, reject) => {
return new Promise((resolve) => {
chrome.storage.local.set({options: JSON.stringify(options)}, resolve);
}).then(() => {
apiOptionsSet(options);