alex/yomichan
1
Fork 0
Code Releases Activity

work on sandbox

Browse Source
This commit is contained in:
Alex Yatskov 2017-09-06 13:35:18 -07:00
parent a3c8508031
commit 9efe7bfe1b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,8 @@ async function apiDefinitionAdd(definition, mode) {
); );
} }
return utilBackend().anki.addNote(dictNoteFormat(definition, mode, options)); const note = await dictNoteFormat(definition, mode, options);
return utilBackend().anki.addNote(note);
} }
async function apiDefinitionsAddable(definitions, modes) { async function apiDefinitionsAddable(definitions, modes) {
@ -72,7 +73,8 @@ async function apiDefinitionsAddable(definitions, modes) {
const notes = []; const notes = [];
for (const definition of definitions) { for (const definition of definitions) {
for (const mode of modes) { for (const mode of modes) {
notes.push(dictNoteFormat(definition, mode, utilBackend().options)); const note = await dictNoteFormat(definition, mode, utilBackend().options);
notes.push(note);
} }
} }

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

@ -192,7 +192,7 @@ function dictFieldSplit(field) {
return field.length === 0 ? [] : field.split(' '); return field.length === 0 ? [] : field.split(' ');
} }
function dictFieldFormat(field, definition, mode, options) { async function dictFieldFormat(field, definition, mode, options) {
const markers = [ const markers = [
'audio', 'audio',
'character', 'character',
@ -223,13 +223,14 @@ function dictFieldFormat(field, definition, mode, options) {
modeKanji: mode === 'kanji' modeKanji: mode === 'kanji'
}; };
field = field.replace(`{${marker}}`, handlebarsRender('fields.html', data)); const html = await apiTemplateRender(options.anki.fieldTemplates, data, true);
field = field.replace(`{${marker}}`, html);
} }
return field; return field;
} }
function dictNoteFormat(definition, mode, options) { async function dictNoteFormat(definition, mode, options) {
const note = {fields: {}, tags: options.anki.tags}; const note = {fields: {}, tags: options.anki.tags};
let fields = []; let fields = [];
@ -263,7 +264,7 @@ function dictNoteFormat(definition, mode, options) {
} }
for (const name in fields) { for (const name in fields) {
note.fields[name] = dictFieldFormat(fields[name], definition, mode, options); note.fields[name] = await dictFieldFormat(fields[name], definition, mode, options);
} }
return note; return note;