alex/yomichan
1
Fork 0
Code Releases Activity

Move error handling for apiDefinitionsAddable

Browse Source
This commit is contained in:
toasted-nutbread 2020-02-15 20:33:20 -05:00
parent faf15c08aa
commit 496d2599ea
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/mixed/js/api.js
View File

@ -58,7 +58,7 @@ function apiDefinitionAdd(definition, mode, context, optionsContext) {
} }
function apiDefinitionsAddable(definitions, modes, optionsContext) { function apiDefinitionsAddable(definitions, modes, optionsContext) {
return _apiInvoke('definitionsAddable', {definitions, modes, optionsContext}).catch(() => null); return _apiInvoke('definitionsAddable', {definitions, modes, optionsContext});
} }
function apiNoteView(noteId) { function apiNoteView(noteId) {

12
ext/mixed/js/display.js
View File

@ -414,7 +414,7 @@ class Display {
this.setEventListenersActive(true); this.setEventListenersActive(true);
const states = await apiDefinitionsAddable(definitions, ['term-kanji', 'term-kana'], this.getOptionsContext()); const states = await this.getDefinitionsAddable(definitions, ['term-kanji', 'term-kana']);
if (this.setContentToken !== token) { return; } if (this.setContentToken !== token) { return; }
this.updateAdderButtons(states); this.updateAdderButtons(states);
@ -463,7 +463,7 @@ class Display {
this.setEventListenersActive(true); this.setEventListenersActive(true);
const states = await apiDefinitionsAddable(definitions, ['kanji'], this.getOptionsContext()); const states = await this.getDefinitionsAddable(definitions, ['kanji']);
if (this.setContentToken !== token) { return; } if (this.setContentToken !== token) { return; }
this.updateAdderButtons(states); this.updateAdderButtons(states);
@ -776,6 +776,14 @@ class Display {
return entry !== null ? entry.querySelector('.action-play-audio>img') : null; return entry !== null ? entry.querySelector('.action-play-audio>img') : null;
} }
async getDefinitionsAddable(definitions, modes) {
try {
return await apiDefinitionsAddable(definitions, modes, this.getOptionsContext());
} catch (e) {
return [];
}
}
static delay(time) { static delay(time) {
return new Promise((resolve) => setTimeout(resolve, time)); return new Promise((resolve) => setTimeout(resolve, time));
} }