alex/yomichan
1
Fork 0
Code Releases Activity

Merge pull request #474 from siikamiika/fix-custom-anki-templates

Browse Source 
fix custom anki templates
This commit is contained in:
siikamiika 2020-04-24 00:38:29 +03:00 committed by GitHub
commit 6a39b0cd7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,7 +496,7 @@ class Backend {
async _onApiDefinitionAdd({definition, mode, context, details, optionsContext}) { async _onApiDefinitionAdd({definition, mode, context, details, optionsContext}) {
const options = this.getOptions(optionsContext); const options = this.getOptions(optionsContext);
const templates = this.defaultAnkiFieldTemplates; const templates = this._getTemplates(options);
if (mode !== 'kanji') { if (mode !== 'kanji') {
const {customSourceUrl} = options.audio; const {customSourceUrl} = options.audio;
@ -522,7 +522,7 @@ class Backend {
async _onApiDefinitionsAddable({definitions, modes, context, optionsContext}) { async _onApiDefinitionsAddable({definitions, modes, context, optionsContext}) {
const options = this.getOptions(optionsContext); const options = this.getOptions(optionsContext);
const templates = this.defaultAnkiFieldTemplates; const templates = this._getTemplates(options);
const states = []; const states = [];
try { try {
@ -945,6 +945,11 @@ class Backend {
return handlebarsRenderDynamic(template, data); return handlebarsRenderDynamic(template, data);
} }
_getTemplates(options) {
const templates = options.anki.fieldTemplates;
return typeof templates === 'string' ? templates : this.defaultAnkiFieldTemplates;
}
static _getTabUrl(tab) { static _getTabUrl(tab) {
return new Promise((resolve) => { return new Promise((resolve) => {
chrome.tabs.sendMessage(tab.id, {action: 'getUrl'}, {frameId: 0}, (response) => { chrome.tabs.sendMessage(tab.id, {action: 'getUrl'}, {frameId: 0}, (response) => {