From 4a6055d781cd9bafb1887ef4e8ee26d3735ad405 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sat, 7 May 2016 18:24:31 -0700 Subject: WIP --- ext/bg/js/translator.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'ext/bg/js/translator.js') diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js index 1a7b9bb4..30bc92c1 100644 --- a/ext/bg/js/translator.js +++ b/ext/bg/js/translator.js @@ -33,14 +33,19 @@ class Translator { this.deinflector = new Deinflector(); } - loadData(callback) { + loadData({loadEnamDict=true}, callback) { if (this.loaded) { callback(); return; } + let files = ['rules', 'tags', 'edict', 'kanjidic']; + if (loadEnamDict) { + files = files.concat('enamdict'); + } + const pendingLoads = []; - for (const key of ['rules', 'tags', 'edict', 'enamdict', 'kanjidic']) { + for (const key of files) { pendingLoads.push(key); Translator.loadData(this.paths[key], (response) => { switch (key) { @@ -82,10 +87,12 @@ class Translator { return tags; }); - if (dfs !== null) { - for (const df of dfs) { - this.processTerm(groups, df.source, df.tags, df.rules, df.root); - } + if (dfs === null) { + continue; + } + + for (const df of dfs) { + this.processTerm(groups, df.source, df.tags, df.rules, df.root); } } @@ -131,7 +138,7 @@ class Translator { } findKanji(text) { - let definitions = []; + let definitions = []; const processed = {}; for (const c of text) { -- cgit v1.2.3