alex/yomichan
1
Fork 0
Code Releases Activity

User dictionary importing

Browse Source
This commit is contained in:
Alex Yatskov 2016-11-07 09:22:57 -08:00
parent 8f995194bb
commit da29797dcf
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/bg/js/translator.js
View File

@ -30,9 +30,9 @@ class Translator {
return Promise.resolve(); return Promise.resolve();
} }
return loadJson('bg/data/rules.json').then(rules => { return loadJsonInt('bg/data/rules.json').then(rules => {
this.deinflector.setRules(rules); this.deinflector.setRules(rules);
return loadJson('bg/data/tags.json'); return loadJsonInt('bg/data/tags.json');
}).then(tagMeta => { }).then(tagMeta => {
this.tagMeta = tagMeta; this.tagMeta = tagMeta;
return this.database.prepare(); return this.database.prepare();

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

@ -113,11 +113,15 @@ function loadJson(url) {
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
xhr.addEventListener('load', () => resolve(JSON.parse(xhr.responseText))); xhr.addEventListener('load', () => resolve(JSON.parse(xhr.responseText)));
xhr.addEventListener('error', () => reject('failed to execute network request')); xhr.addEventListener('error', () => reject('failed to execute network request'));
xhr.open('GET', chrome.extension.getURL(url)); xhr.open('GET', url);
xhr.send(); xhr.send();
}); });
} }
function loadJsonInt(url) {
return loadJson(chrome.extension.getURL(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 => {