alex/yomichan
1
Fork 0
Code Releases Activity

Cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2016-09-10 19:40:56 -07:00
parent fa391bd5d3
commit 47ef617eb4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ext/bg/js/dictionary.js
View File

@ -38,7 +38,7 @@ class Dictionary {
findTerm(term) { findTerm(term) {
const results = []; const results = [];
return this.db.terms.where('expression').equals(term).or('reading').equals(term).each((row) => { return this.db.terms.where('expression').equals(term).or('reading').equals(term).each(row => {
results.push({ results.push({
expression: row.expression, expression: row.expression,
reading: row.reading, reading: row.reading,
@ -48,7 +48,7 @@ class Dictionary {
}); });
}).then(() => { }).then(() => {
return this.getEntities(); return this.getEntities();
}).then((entities) => { }).then(entities => {
for (const result of results) { for (const result of results) {
result.entities = entities; result.entities = entities;
} }
@ -59,7 +59,7 @@ class Dictionary {
findKanji(kanji) { findKanji(kanji) {
const results = []; const results = [];
return this.db.kanji.where('c').equals(kanji).each((row) => { return this.db.kanji.where('c').equals(kanji).each(row => {
results.push({ results.push({
character: row.c, character: row.c,
onyomi: row.o.split(' '), onyomi: row.o.split(' '),
@ -75,7 +75,7 @@ class Dictionary {
return this.entities; return this.entities;
} }
return this.db.entities.toArray((rows) => { return this.db.entities.toArray(rows => {
this.entities = {}; this.entities = {};
for (const row of rows) { for (const row of rows) {
this.entities[row.name] = row.value; this.entities[row.name] = row.value;
@ -88,7 +88,7 @@ class Dictionary {
importTermDict(indexUrl) { importTermDict(indexUrl) {
const indexDir = indexUrl.slice(0, indexUrl.lastIndexOf('/')); const indexDir = indexUrl.slice(0, indexUrl.lastIndexOf('/'));
return loadJson(indexUrl).then((index) => { return loadJson(indexUrl).then(index => {
const entities = []; const entities = [];
for (const [name, value] of index.ents) { for (const [name, value] of index.ents) {
entities.push({name, value}); entities.push({name, value});
@ -107,9 +107,9 @@ class Dictionary {
for (let i = 1; i <= index.banks; ++i) { for (let i = 1; i <= index.banks; ++i) {
const bankUrl = `${indexDir}/bank_${i}.json`; const bankUrl = `${indexDir}/bank_${i}.json`;
loaders.push(() => { loaders.push(() => {
return loadJson(bankUrl).then((defs) => { return loadJson(bankUrl).then(definitions => {
const rows = []; const rows = [];
for (const [expression, reading, tags, ...glossary] of defs) { for (const [expression, reading, tags, ...glossary] of definitions) {
rows.push({expression, reading, tags, glossary}); rows.push({expression, reading, tags, glossary});
} }
@ -131,14 +131,14 @@ class Dictionary {
importKanjiDict(indexUrl) { importKanjiDict(indexUrl) {
const indexDir = indexUrl.slice(0, indexUrl.lastIndexOf('/')); const indexDir = indexUrl.slice(0, indexUrl.lastIndexOf('/'));
return loadJson(indexUrl).then((index) => { return loadJson(indexUrl).then(index => {
const loaders = []; const loaders = [];
for (let i = 1; i <= index.banks; ++i) { for (let i = 1; i <= index.banks; ++i) {
const bankUrl = `${indexDir}/bank_${i}.json`; const bankUrl = `${indexDir}/bank_${i}.json`;
loaders.push(() => { loaders.push(() => {
return loadJson(bankUrl).then((defs) => { return loadJson(bankUrl).then(definitions => {
const rows = []; const rows = [];
for (const [character, onyomi, kunyomi, tags, ...meanings] of defs) { for (const [character, onyomi, kunyomi, tags, ...meanings] of definitions) {
rows.push({character, onyomi, kunyomi, tags, meanings}); rows.push({character, onyomi, kunyomi, tags, meanings});
} }