alex/yomichan
1
Fork 0
Code Releases Activity

Dictionary definition structure fixes (#888)

Browse Source 
* Restore support for tags without metadata

* Fix missing spread
This commit is contained in:
toasted-nutbread 2020-10-05 21:10:52 -04:00 committed by GitHub
parent 8c8c27001e
commit 0cfaa1a5a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,7 +446,7 @@ class Translator {
this._addUniqueTermInfos(relatedDefinitions, termInfoMap); this._addUniqueTermInfos(relatedDefinitions, termInfoMap);
let secondaryDefinitions = await this._getMergedSecondarySearchResults(termInfoMap, secondarySearchDictionaryMap); let secondaryDefinitions = await this._getMergedSecondarySearchResults(termInfoMap, secondarySearchDictionaryMap);
secondaryDefinitions = [unsequencedDefinitions, ...secondaryDefinitions]; secondaryDefinitions = [...unsequencedDefinitions, ...secondaryDefinitions];
this._removeUsedDefinitions(secondaryDefinitions, termInfoMap, usedDefinitions); this._removeUsedDefinitions(secondaryDefinitions, termInfoMap, usedDefinitions);
this._removeDuplicateDefinitions(secondaryDefinitions); this._removeDuplicateDefinitions(secondaryDefinitions);
@ -721,9 +721,8 @@ class Translator {
const results = []; const results = [];
for (let i = 0, ii = tagMetaList.length; i < ii; ++i) { for (let i = 0, ii = tagMetaList.length; i < ii; ++i) {
const meta = tagMetaList[i]; const meta = tagMetaList[i];
if (meta === null) { continue; }
const name = names[i]; const name = names[i];
const {category, notes, order, score, dictionary} = meta; const {category, notes, order, score, dictionary} = (meta !== null ? meta : {dictionary: title});
const tag = this._createTag(name, category, notes, order, score, dictionary); const tag = this._createTag(name, category, notes, order, score, dictionary);
results.push(tag); results.push(tag);
} }