diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js index 19c66186..cd4bd4c1 100644 --- a/ext/bg/js/yomichan.js +++ b/ext/bg/js/yomichan.js @@ -153,35 +153,51 @@ class Yomichan { } formatField(field, definition, mode) { - const supported = ['character', 'expression', 'glossary', 'kunyomi', 'onyomi', 'reading']; + const tags = [ + 'character', + 'expression', + 'glossary', + 'glossary-list', + 'kunyomi', + 'onyomi', + 'reading', + 'tags', + ]; - for (let key in definition) { - if (supported.indexOf(key) === -1) { - continue; + for (let tag of tags) { + let value = definition[tag] || null; + switch (tag) { + case 'expression': + if (mode === 'vocab_kana' && definition.reading) { + value = definition.reading; + } + break; + case 'reading': + if (mode === 'vocab_kana') { + value = null; + } + break; + case 'glossary-list': + if (definition.glossary) { + value = '
Supported field tags: {expression}
, {reading}
, {glossary}
Allowed tags: {expression}
, {reading}
, {glossary}
, {glossary-list}
, {tags}
Supported field tags: {character}
, {onyomi}
, {kunyomi}
, {glossary}
Allowed tags: {character}
, {onyomi}
, {kunyomi}
, {glossary}
, {glossary-list}