alex/yomichan
1
Fork 0
Code Releases Activity

Error handling

Browse Source
This commit is contained in:
Alex Yatskov 2016-11-07 22:31:57 -08:00
parent f2f7b7f3db
commit af45e8fab6
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ext/bg/js/util.js
View File

@ -111,10 +111,17 @@ function splitField(field) {
function loadJson(url) { function loadJson(url) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
xhr.addEventListener('load', () => resolve(JSON.parse(xhr.responseText))); xhr.addEventListener('load', () => resolve(xhr.responseText));
xhr.addEventListener('error', () => reject('failed to execute network request')); xhr.addEventListener('error', () => reject('failed to execute network request'));
xhr.open('GET', url); xhr.open('GET', url);
xhr.send(); xhr.send();
}).then(responseText => {
try {
return JSON.parse(responseText);
}
catch (e) {
return Promise.reject('invalid JSON response');
}
}); });
} }
@ -125,6 +132,10 @@ function loadJsonInt(url) {
function importJsonDb(indexUrl, indexLoaded, termsLoaded, kanjiLoaded) { function importJsonDb(indexUrl, indexLoaded, termsLoaded, kanjiLoaded) {
const indexDir = indexUrl.slice(0, indexUrl.lastIndexOf('/')); const indexDir = indexUrl.slice(0, indexUrl.lastIndexOf('/'));
return loadJson(indexUrl).then(index => { return loadJson(indexUrl).then(index => {
if (!index.title || !index.version) {
return Promise.reject('unrecognized dictionary format');
}
if (indexLoaded !== null) { if (indexLoaded !== null) {
return indexLoaded( return indexLoaded(
index.title, index.title,