alex/yomichan
1
Fork 0
Code Releases Activity

Create common function for utilBackend().options

Browse Source
This commit is contained in:
toasted-nutbread 2019-09-06 20:49:12 -04:00
parent a74cdbff1d
commit 35ca0f35dd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,12 +21,16 @@ async function apiOptionsSet(options) {
utilBackend().onOptionsUpdated(options); utilBackend().onOptionsUpdated(options);
} }
async function apiOptionsGet() { function apiOptionsGetSync() {
return utilBackend().options; return utilBackend().options;
} }
async function apiOptionsGet() {
return apiOptionsGetSync();
}
async function apiTermsFind(text) { async function apiTermsFind(text) {
const options = utilBackend().options; const options = apiOptionsGetSync();
const translator = utilBackend().translator; const translator = utilBackend().translator;
const searcher = { const searcher = {
@ -48,13 +52,13 @@ async function apiTermsFind(text) {
} }
async function apiKanjiFind(text) { async function apiKanjiFind(text) {
const options = utilBackend().options; const options = apiOptionsGetSync();
const definitions = await utilBackend().translator.findKanji(text, dictEnabledSet(options)); const definitions = await utilBackend().translator.findKanji(text, dictEnabledSet(options));
return definitions.slice(0, options.general.maxResults); return definitions.slice(0, options.general.maxResults);
} }
async function apiDefinitionAdd(definition, mode, context) { async function apiDefinitionAdd(definition, mode, context) {
const options = utilBackend().options; const options = apiOptionsGetSync();
if (mode !== 'kanji') { if (mode !== 'kanji') {
await audioInject( await audioInject(
@ -83,7 +87,7 @@ 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) {
const note = await dictNoteFormat(definition, mode, utilBackend().options); const note = await dictNoteFormat(definition, mode, apiOptionsGetSync());
notes.push(note); notes.push(note);
} }
} }
@ -131,7 +135,7 @@ async function apiCommandExec(command) {
}, },
toggle: async () => { toggle: async () => {
const options = utilBackend().options; const options = apiOptionsGetSync();
options.general.enable = !options.general.enable; options.general.enable = !options.general.enable;
await optionsSave(options); await optionsSave(options);
await apiOptionsSet(options); await apiOptionsSet(options);