aboutsummaryrefslogtreecommitdiff
path: root/ext/bg/js
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-08-17 19:19:34 -0700
committerAlex Yatskov <alex@foosoft.net>2017-08-17 19:19:34 -0700
commit7586572fbaab7de698ec13f8712cc95e24ab6273 (patch)
tree665417b73c928694b96c00a98dd882c618e1fd1d /ext/bg/js
parent3475150b2d1424d43f5be6fcfbdbb719a576866f (diff)
parent191336522c220b0a3cfe41515ed23946b3462217 (diff)
Merge branch 'dev'
Diffstat (limited to 'ext/bg/js')
-rw-r--r--ext/bg/js/anki-connect.js84
-rw-r--r--ext/bg/js/anki-null.js40
-rw-r--r--ext/bg/js/anki.js104
-rw-r--r--ext/bg/js/api.js128
-rw-r--r--ext/bg/js/audio.js154
-rw-r--r--ext/bg/js/backend.js131
-rw-r--r--ext/bg/js/context.js (renamed from ext/bg/js/popup.js)12
-rw-r--r--ext/bg/js/database.js296
-rw-r--r--ext/bg/js/deinflector.js66
-rw-r--r--ext/bg/js/dictionary.js273
-rw-r--r--ext/bg/js/display-window.js63
-rw-r--r--ext/bg/js/handlebars.js55
-rw-r--r--ext/bg/js/options.js457
-rw-r--r--ext/bg/js/request.js40
-rw-r--r--ext/bg/js/search.js55
-rw-r--r--ext/bg/js/settings.js432
-rw-r--r--ext/bg/js/templates.js321
-rw-r--r--ext/bg/js/translator.js163
-rw-r--r--ext/bg/js/util.js542
-rw-r--r--ext/bg/js/yomichan.js225
20 files changed, 1922 insertions, 1719 deletions
diff --git a/ext/bg/js/anki-connect.js b/ext/bg/js/anki-connect.js
deleted file mode 100644
index 9759c8f5..00000000
--- a/ext/bg/js/anki-connect.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-class AnkiConnect {
- constructor(server) {
- this.server = server;
- this.asyncPools = {};
- this.localVersion = 2;
- this.remoteVersion = null;
- }
-
- addNote(note) {
- return this.checkVersion().then(() => this.ankiInvoke('addNote', {note}, null));
- }
-
- canAddNotes(notes) {
- return this.checkVersion().then(() => this.ankiInvoke('canAddNotes', {notes}, 'notes'));
- }
-
- getDeckNames() {
- return this.checkVersion().then(() => this.ankiInvoke('deckNames', {}, null));
- }
-
- getModelNames() {
- return this.checkVersion().then(() => this.ankiInvoke('modelNames', {}, null));
- }
-
- getModelFieldNames(modelName) {
- return this.checkVersion().then(() => this.ankiInvoke('modelFieldNames', {modelName}, null));
- }
-
- checkVersion() {
- if (this.localVersion === this.remoteVersion) {
- return Promise.resolve(true);
- }
-
- return this.ankiInvoke('version', {}, null).then(version => {
- this.remoteVersion = version;
- if (this.remoteVersion < this.localVersion) {
- return Promise.reject('extension and plugin versions incompatible');
- }
- });
- }
-
- ankiInvoke(action, params, pool) {
- return new Promise((resolve, reject) => {
- if (pool !== null && this.asyncPools.hasOwnProperty(pool)) {
- this.asyncPools[pool].abort();
- }
-
- const xhr = new XMLHttpRequest();
- xhr.addEventListener('loadend', () => {
- if (pool !== null) {
- delete this.asyncPools[pool];
- }
-
- if (xhr.responseText) {
- resolve(JSON.parse(xhr.responseText));
- } else {
- reject('unable to connect to plugin');
- }
- });
-
- xhr.open('POST', this.server);
- xhr.send(JSON.stringify({action, params}));
- });
- }
-}
diff --git a/ext/bg/js/anki-null.js b/ext/bg/js/anki-null.js
deleted file mode 100644
index 99dc2f30..00000000
--- a/ext/bg/js/anki-null.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-class AnkiNull {
- addNote(note) {
- return Promise.reject('unsupported action');
- }
-
- canAddNotes(notes) {
- return Promise.resolve([]);
- }
-
- getDeckNames() {
- return Promise.resolve([]);
- }
-
- getModelNames() {
- return Promise.resolve([]);
- }
-
- getModelFieldNames(modelName) {
- return Promise.resolve([]);
- }
-}
diff --git a/ext/bg/js/anki.js b/ext/bg/js/anki.js
new file mode 100644
index 00000000..c327969f
--- /dev/null
+++ b/ext/bg/js/anki.js
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+/*
+ * AnkiConnect
+ */
+
+class AnkiConnect {
+ constructor(server) {
+ this.server = server;
+ this.localVersion = 2;
+ this.remoteVersion = 0;
+ }
+
+ async addNote(note) {
+ await this.checkVersion();
+ return await this.ankiInvoke('addNote', {note});
+ }
+
+ async canAddNotes(notes) {
+ await this.checkVersion();
+ return await this.ankiInvoke('canAddNotes', {notes});
+ }
+
+ async getDeckNames() {
+ await this.checkVersion();
+ return await this.ankiInvoke('deckNames');
+ }
+
+ async getModelNames() {
+ await this.checkVersion();
+ return await this.ankiInvoke('modelNames');
+ }
+
+ async getModelFieldNames(modelName) {
+ await this.checkVersion();
+ return await this.ankiInvoke('modelFieldNames', {modelName});
+ }
+
+ async guiBrowse(query) {
+ await this.checkVersion();
+ return await this.ankiInvoke('guiBrowse', {query});
+ }
+
+ async checkVersion() {
+ if (this.remoteVersion < this.localVersion) {
+ this.remoteVersion = await this.ankiInvoke('version');
+ if (this.remoteVersion < this.localVersion) {
+ throw 'extension and plugin versions incompatible';
+ }
+ }
+ }
+
+ ankiInvoke(action, params) {
+ return requestJson(this.server, 'POST', {action, params, version: this.localVersion});
+ }
+}
+
+
+/*
+ * AnkiNull
+ */
+
+class AnkiNull {
+ async addNote(note) {
+ return null;
+ }
+
+ async canAddNotes(notes) {
+ return [];
+ }
+
+ async getDeckNames() {
+ return [];
+ }
+
+ async getModelNames() {
+ return [];
+ }
+
+ async getModelFieldNames(modelName) {
+ return [];
+ }
+
+ async guiBrowse(query) {
+ return [];
+ }
+}
diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
new file mode 100644
index 00000000..2afe82a0
--- /dev/null
+++ b/ext/bg/js/api.js
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2016-2017 Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+async function apiOptionsSet(options) {
+ utilBackend().onOptionsUpdated(options);
+}
+
+async function apiOptionsGet() {
+ return utilBackend().options;
+}
+
+async function apiTermsFind(text) {
+ const options = utilBackend().options;
+ const translator = utilBackend().translator;
+
+ const searcher = options.general.groupResults ?
+ translator.findTermsGrouped.bind(translator) :
+ translator.findTerms.bind(translator);
+
+ const {definitions, length} = await searcher(
+ text,
+ dictEnabledSet(options),
+ options.scanning.alphanumeric
+ );
+
+ return {
+ length,
+ definitions: definitions.slice(0, options.general.maxResults)
+ };
+}
+
+async function apiKanjiFind(text) {
+ const options = utilBackend().options;
+ const definitions = await utilBackend().translator.findKanji(text, dictEnabledSet(options));
+ return definitions.slice(0, options.general.maxResults);
+}
+
+async function apiDefinitionAdd(definition, mode) {
+ const options = utilBackend().options;
+
+ if (mode !== 'kanji') {
+ await audioInject(
+ definition,
+ options.anki.terms.fields,
+ options.general.audioSource
+ );
+ }
+
+ return utilBackend().anki.addNote(dictNoteFormat(definition, mode, options));
+}
+
+async function apiDefinitionsAddable(definitions, modes) {
+ const notes = [];
+ for (const definition of definitions) {
+ for (const mode of modes) {
+ notes.push(dictNoteFormat(definition, mode, utilBackend().options));
+ }
+ }
+
+ const results = await utilBackend().anki.canAddNotes(notes);
+ const states = [];
+ for (let resultBase = 0; resultBase < results.length; resultBase += modes.length) {
+ const state = {};
+ for (let modeOffset = 0; modeOffset < modes.length; ++modeOffset) {
+ state[modes[modeOffset]] = results[resultBase + modeOffset];
+ }
+
+ states.push(state);
+ }
+
+ return states;
+}
+
+async function apiNoteView(noteId) {
+ return utilBackend().anki.guiBrowse(`nid:${noteId}`);
+}
+
+async function apiTemplateRender(template, data) {
+ return handlebarsRender(template, data);
+}
+
+async function apiCommandExec(command) {
+ const handlers = {
+ search: () => {
+ chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
+ },
+
+ help: () => {
+ chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
+ },
+
+ options: () => {
+ chrome.runtime.openOptionsPage();
+ },
+
+ toggle: async () => {
+ const options = utilBackend().options;
+ options.general.enable = !options.general.enable;
+ await optionsSave(options);
+ await apiOptionsSet(options);
+ }
+ };
+
+ const handler = handlers[command];
+ if (handler) {
+ handler();
+ }
+}
+
+async function apiAudioGetUrl(definition, source) {
+ return audioBuildUrl(definition, source);
+}
diff --git a/ext/bg/js/audio.js b/ext/bg/js/audio.js
new file mode 100644
index 00000000..0952887e
--- /dev/null
+++ b/ext/bg/js/audio.js
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2017 Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+async function audioBuildUrl(definition, mode, cache={}) {
+ if (mode === 'jpod101') {
+ let kana = definition.reading;
+ let kanji = definition.expression;
+
+ if (!kana && wanakana.isHiragana(kanji)) {
+ kana = kanji;
+ kanji = null;
+ }
+
+ const params = [];
+ if (kanji) {
+ params.push(`kanji=${encodeURIComponent(kanji)}`);
+ }
+ if (kana) {
+ params.push(`kana=${encodeURIComponent(kana)}`);
+ }
+
+ const url = `https://assets.languagepod101.com/dictionary/japanese/audiomp3.php?${params.join('&')}`;
+ return Promise.resolve(url);
+ } else if (mode === 'jpod101-alternate') {
+ return new Promise((resolve, reject) => {
+ const response = cache[definition.expression];
+ if (response) {
+ resolve(response);
+ } else {
+ const data = {
+ post: 'dictionary_reference',
+ match_type: 'exact',
+ search_query: definition.expression
+ };
+
+ const params = [];
+ for (const key in data) {
+ params.push(`${encodeURIComponent(key)}=${encodeURIComponent(data[key])}`);
+ }
+
+ const xhr = new XMLHttpRequest();
+ xhr.open('POST', 'https://www.japanesepod101.com/learningcenter/reference/dictionary_post');
+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+ xhr.addEventListener('error', () => reject('failed to scrape audio data'));
+ xhr.addEventListener('load', () => {
+ cache[definition.expression] = xhr.responseText;
+ resolve(xhr.responseText);
+ });
+
+ xhr.send(params.join('&'));
+ }
+ }).then(response => {
+ const dom = new DOMParser().parseFromString(response, 'text/html');
+ for (const row of dom.getElementsByClassName('dc-result-row')) {
+ try {
+ const url = row.getElementsByClassName('ill-onebuttonplayer').item(0).getAttribute('data-url');
+ const reading = row.getElementsByClassName('dc-vocab_kana').item(0).innerText;
+ if (url && reading && (!definition.reading || definition.reading === reading)) {
+ return url;
+ }
+ } catch (e) {
+ // NOP
+ }
+ }
+ });
+ } else if (mode === 'jisho') {
+ return new Promise((resolve, reject) => {
+ const response = cache[definition.expression];
+ if (response) {
+ resolve(response);
+ } else {
+ const xhr = new XMLHttpRequest();
+ xhr.open('GET', `http://jisho.org/search/${definition.expression}`);
+ xhr.addEventListener('error', () => reject('failed to scrape audio data'));
+ xhr.addEventListener('load', () => {
+ cache[definition.expression] = xhr.responseText;
+ resolve(xhr.responseText);
+ });
+
+ xhr.send();
+ }
+ }).then(response => {
+ try {
+ const dom = new DOMParser().parseFromString(response, 'text/html');
+ const audio = dom.getElementById(`audio_${definition.expression}:${definition.reading}`);
+ if (audio) {
+ return audio.getElementsByTagName('source').item(0).getAttribute('src');
+ }
+ } catch (e) {
+ // NOP
+ }
+ });
+ }
+ else {
+ return Promise.resolve();
+ }
+}
+
+function audioBuildFilename(definition) {
+ if (definition.reading || definition.expression) {
+ let filename = 'yomichan';
+ if (definition.reading) {
+ filename += `_${definition.reading}`;
+ }
+ if (definition.expression) {
+ filename += `_${definition.expression}`;
+ }
+
+ return filename += '.mp3';
+ }
+}
+
+async function audioInject(definition, fields, mode) {
+ let usesAudio = false;
+ for (const name in fields) {
+ if (fields[name].includes('{audio}')) {
+ usesAudio = true;
+ break;
+ }
+ }
+
+ if (!usesAudio) {
+ return true;
+ }
+
+ try {
+ const url = await audioBuildUrl(definition, mode);
+ const filename = audioBuildFilename(definition);
+
+ if (url && filename) {
+ definition.audio = {url, filename};
+ }
+
+ return true;
+ } catch (e) {
+ return false;
+ }
+}
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
new file mode 100644
index 00000000..6b3acaa9
--- /dev/null
+++ b/ext/bg/js/backend.js
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2016-2017 Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+class Backend {
+ constructor() {
+ this.translator = new Translator();
+ this.anki = new AnkiNull();
+ this.options = null;
+ }
+
+ async prepare() {
+ await this.translator.prepare();
+ await apiOptionsSet(await optionsLoad());
+
+ chrome.commands.onCommand.addListener(this.onCommand.bind(this));
+ chrome.runtime.onMessage.addListener(this.onMessage.bind(this));
+
+ if (this.options.general.showGuide) {
+ chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
+ }
+ }
+
+ onOptionsUpdated(options) {
+ this.options = utilIsolate(options);
+
+ if (!options.general.enable) {
+ chrome.browserAction.setBadgeBackgroundColor({color: '#555555'});
+ chrome.browserAction.setBadgeText({text: 'off'});
+ } else if (!dictConfigured(options)) {
+ chrome.browserAction.setBadgeBackgroundColor({color: '#f0ad4e'});
+ chrome.browserAction.setBadgeText({text: '!'});
+ } else {
+ chrome.browserAction.setBadgeText({text: ''});
+ }
+
+ if (options.anki.enable) {
+ this.anki = new AnkiConnect(options.anki.server);
+ } else {
+ this.anki = new AnkiNull();
+ }
+
+ chrome.tabs.query({}, tabs => {
+ for (const tab of tabs) {
+ chrome.tabs.sendMessage(tab.id, {action: 'optionsSet', params: options}, () => null);
+ }
+ });
+ }
+
+ onCommand(command) {
+ apiCommandExec(command);
+ }
+
+ onMessage({action, params}, sender, callback) {
+ const forward = (promise, callback) => {
+ return promise.then(result => {
+ callback({result});
+ }).catch(error => {
+ callback({error});
+ });
+ };
+
+ const handlers = {
+ optionsGet: ({callback}) => {
+ forward(apiOptionsGet(), callback);
+ },
+
+ optionsSet: ({options, callback}) => {
+ forward(apiOptionsSet(options), callback);
+ },
+
+ kanjiFind: ({text, callback}) => {
+ forward(apiKanjiFind(text), callback);
+ },
+
+ termsFind: ({text, callback}) => {
+ forward(apiTermsFind(text), callback);
+ },
+
+ definitionAdd: ({definition, mode, callback}) => {
+ forward(apiDefinitionAdd(definition, mode), callback);
+ },
+
+ definitionsAddable: ({definitions, modes, callback}) => {
+ forward(apiDefinitionsAddable(definitions, modes), callback);
+ },
+
+ noteView: ({noteId}) => {
+ forward(apiNoteView(noteId), callback);
+ },
+
+ templateRender: ({template, data, callback}) => {
+ forward(apiTemplateRender(template, data), callback);
+ },
+
+ commandExec: ({command, callback}) => {
+ forward(apiCommandExec(command), callback);
+ },
+
+ audioGetUrl: ({definition, source, callback}) => {
+ forward(apiAudioGetUrl(definition, source), callback);
+ }
+ };
+
+ const handler = handlers[action];
+ if (handler) {
+ params.callback = callback;
+ handler(params);
+ }
+
+ return true;
+ }
+}
+
+window.yomichan_backend = new Backend();
+window.yomichan_backend.prepare();
diff --git a/ext/bg/js/popup.js b/ext/bg/js/context.js
index 8577dd96..689d6863 100644
--- a/ext/bg/js/popup.js
+++ b/ext/bg/js/context.js
@@ -17,15 +17,15 @@
*/
-$(document).ready(() => {
- $('#open-search').click(() => commandExec('search'));
- $('#open-options').click(() => commandExec('options'));
- $('#open-help').click(() => commandExec('help'));
+$(document).ready(utilAsync(() => {
+ $('#open-search').click(() => apiCommandExec('search'));
+ $('#open-options').click(() => apiCommandExec('options'));
+ $('#open-help').click(() => apiCommandExec('help'));
optionsLoad().then(options => {
const toggle = $('#enable-search');
toggle.prop('checked', options.general.enable).change();
toggle.bootstrapToggle();
- toggle.change(() => commandExec('toggle'));
+ toggle.change(() => apiCommandExec('toggle'));
});
-});
+}));
diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 4829356c..e00cb7a3 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017 Alex Yatskov <alex@foosoft.net>
* Author: Alex Yatskov <alex@foosoft.net>
*
* This program is free software: you can redistribute it and/or modify
@@ -20,59 +20,62 @@
class Database {
constructor() {
this.db = null;
- this.dbVersion = 2;
- this.tagMetaCache = {};
+ this.version = 2;
+ this.tagCache = {};
}
- sanitize() {
- const db = new Dexie('dict');
- return db.open().then(() => {
+ async sanitize() {
+ try {
+ const db = new Dexie('dict');
+ await db.open();
db.close();
- if (db.verno !== this.dbVersion) {
- return db.delete();
+ if (db.verno !== this.version) {
+ await db.delete();
}
- }).catch(() => {});
+ } catch(e) {
+ // NOP
+ }
}
- prepare() {
- if (this.db !== null) {
- return Promise.reject('database already initialized');
+ async prepare() {
+ if (this.db) {
+ throw 'database already initialized';
}
- return this.sanitize().then(() => {
- this.db = new Dexie('dict');
- this.db.version(this.dbVersion).stores({
- terms: '++id,dictionary,expression,reading',
- kanji: '++,dictionary,character',
- tagMeta: '++,dictionary',
- dictionaries: '++,title,version'
- });
+ await this.sanitize();
- return this.db.open();
+ this.db = new Dexie('dict');
+ this.db.version(this.version).stores({
+ terms: '++id,dictionary,expression,reading',
+ kanji: '++,dictionary,character',
+ tagMeta: '++,dictionary',
+ dictionaries: '++,title,version'
});
+
+ await this.db.open();
}
- purge() {
- if (this.db === null) {
- return Promise.reject('database not initialized');
+ async purge() {
+ if (!this.db) {
+ throw 'database not initialized';
}
this.db.close();
- return this.db.delete().then(() => {
- this.db = null;
- this.tagMetaCache = {};
- return this.prepare();
- });
+ await this.db.delete();
+ this.db = null;
+ this.tagCache = {};
+
+ await this.prepare();
}
- findTerms(term, dictionaries) {
- if (this.db === null) {
- return Promise.reject('database not initialized');
+ async findTerms(term, titles) {
+ if (!this.db) {
+ throw 'database not initialized';
}
const results = [];
- return this.db.terms.where('expression').equals(term).or('reading').equals(term).each(row => {
- if (dictionaries.includes(row.dictionary)) {
+ await this.db.terms.where('expression').equals(term).or('reading').equals(term).each(row => {
+ if (titles.includes(row.dictionary)) {
results.push({
expression: row.expression,
reading: row.reading,
@@ -84,25 +87,24 @@ class Database {
id: row.id
});
}
- }).then(() => {
- return this.cacheTagMeta(dictionaries);
- }).then(() => {
- for (const result of results) {
- result.tagMeta = this.tagMetaCache[result.dictionary] || {};
- }
-
- return results;
});
+
+ await this.cacheTagMeta(titles);
+ for (const result of results) {
+ result.tagMeta = this.tagCache[result.dictionary] || {};
+ }
+
+ return results;
}
- findKanji(kanji, dictionaries) {
- if (this.db === null) {
+ async findKanji(kanji, titles) {
+ if (!this.db) {
return Promise.reject('database not initialized');
}
const results = [];
- return this.db.kanji.where('character').equals(kanji).each(row => {
- if (dictionaries.includes(row.dictionary)) {
+ await this.db.kanji.where('character').equals(kanji).each(row => {
+ if (titles.includes(row.dictionary)) {
results.push({
character: row.character,
onyomi: dictFieldSplit(row.onyomi),
@@ -112,103 +114,100 @@ class Database {
dictionary: row.dictionary
});
}
- }).then(() => {
- return this.cacheTagMeta(dictionaries);
- }).then(() => {
- for (const result of results) {
- result.tagMeta = this.tagMetaCache[result.dictionary] || {};
- }
-
- return results;
});
- }
- cacheTagMeta(dictionaries) {
- if (this.db === null) {
- return Promise.reject('database not initialized');
+ await this.cacheTagMeta(titles);
+ for (const result of results) {
+ result.tagMeta = this.tagCache[result.dictionary] || {};
}
- const promises = [];
- for (const dictionary of dictionaries) {
- if (this.tagMetaCache[dictionary]) {
- continue;
- }
+ return results;
+ }
- const tagMeta = {};
- promises.push(
- this.db.tagMeta.where('dictionary').equals(dictionary).each(row => {
- tagMeta[row.name] = {category: row.category, notes: row.notes, order: row.order};
- }).then(() => {
- this.tagMetaCache[dictionary] = tagMeta;
- })
- );
+ async cacheTagMeta(titles) {
+ if (!this.db) {
+ throw 'database not initialized';
}
- return Promise.all(promises);
- }
+ for (const title of titles) {
+ if (!this.tagCache[title]) {
+ const tagMeta = {};
+ await this.db.tagMeta.where('dictionary').equals(title).each(row => {
+ tagMeta[row.name] = {category: row.category, notes: row.notes, order: row.order};
+ });
- getDictionaries() {
- if (this.db === null) {
- return Promise.reject('database not initialized');
+ this.tagCache[title] = tagMeta;
+ }
}
+ }
- return this.db.dictionaries.toArray();
+ async getDictionaries() {
+ if (this.db) {
+ return this.db.dictionaries.toArray();
+ } else {
+ throw 'database not initialized';
+ }
}
- importDictionary(archive, callback) {
- if (this.db === null) {
+ async importDictionary(archive, callback) {
+ if (!this.db) {
return Promise.reject('database not initialized');
}
let summary = null;
- const indexLoaded = (title, version, revision, tagMeta, hasTerms, hasKanji) => {
+ const indexLoaded = async (title, version, revision, tagMeta, hasTerms, hasKanji) => {
summary = {title, version, revision, hasTerms, hasKanji};
- return this.db.dictionaries.where('title').equals(title).count().then(count => {
- if (count > 0) {
- return Promise.reject(`dictionary "${title}" is already imported`);
- }
-
- return this.db.dictionaries.add({title, version, revision, hasTerms, hasKanji}).then(() => {
- const rows = [];
- for (const tag in tagMeta || {}) {
- const meta = tagMeta[tag];
- const row = dictTagSanitize({
- name: tag,
- category: meta.category,
- notes: meta.notes,
- order: meta.order,
- dictionary: title
- });
-
- rows.push(row);
- }
-
- return this.db.tagMeta.bulkAdd(rows);
+
+ const count = await this.db.dictionaries.where('title').equals(title).count();
+ if (count > 0) {
+ throw `dictionary "${title}" is already imported`;
+ }
+
+ await this.db.dictionaries.add({title, version, revision, hasTerms, hasKanji});
+
+ const rows = [];
+ for (const tag in tagMeta || {}) {
+ const meta = tagMeta[tag];
+ const row = dictTagSanitize({
+ name: tag,
+ category: meta.category,
+ notes: meta.notes,
+ order: meta.order,
+ dictionary: title
});
- });
+
+ rows.push(row);
+ }
+
+ await this.db.tagMeta.bulkAdd(rows);
};
- const termsLoaded = (title, entries, total, current) => {
- return this.db.transaction('rw', this.db.terms, function() {
- for (const [expression, reading, tags, rules, score, ...glossary] of entries) {
- this.db.terms.add({
- expression,
- reading,
- tags,
- rules,
- score,
- glossary,
- dictionary: title
- });
- }
- }).then(() => {
- if (callback) {
- callback(total, current);
- }
- });
+ const termsLoaded = async (title, entries, total, current) => {
+ if (callback) {
+ callback(total, current);
+ }
+
+ const rows = [];
+ for (const [expression, reading, tags, rules, score, ...glossary] of entries) {
+ rows.push({
+ expression,
+ reading,
+ tags,
+ rules,
+ score,
+ glossary,
+ dictionary: title
+ });
+ }
+
+ await this.db.terms.bulkAdd(rows);
};
- const kanjiLoaded = (title, entries, total, current) => {
+ const kanjiLoaded = async (title, entries, total, current) => {
+ if (callback) {
+ callback(total, current);
+ }
+
const rows = [];
for (const [character, onyomi, kunyomi, tags, ...meanings] of entries) {
rows.push({
@@ -221,13 +220,56 @@ class Database {
});
}
- return this.db.kanji.bulkAdd(rows).then(() => {
- if (callback) {
- callback(total, current);
- }
- });
+ await this.db.kanji.bulkAdd(rows);
};
- return zipLoadDb(archive, indexLoaded, termsLoaded, kanjiLoaded).then(() => summary);
+ await Database.importDictionaryZip(archive, indexLoaded, termsLoaded, kanjiLoaded);
+ return summary;
+ }
+
+ static async importDictionaryZip(archive, indexLoaded, termsLoaded, kanjiLoaded) {
+ const files = (await JSZip.loadAsync(archive)).files;
+
+ const indexFile = files['index.json'];
+ if (!indexFile) {
+ throw 'no dictionary index found in archive';
+ }
+
+ const index = JSON.parse(await indexFile.async('string'));
+ if (!index.title || !index.version || !index.revision) {
+ throw 'unrecognized dictionary format';
+ }
+
+ await indexLoaded(
+ index.title,
+ index.version,
+ index.revision,
+ index.tagMeta || {},
+ index.termBanks > 0,
+ index.kanjiBanks > 0
+ );
+
+ const banksTotal = index.termBanks + index.kanjiBanks;
+ let banksLoaded = 0;
+
+ for (let i = 1; i <= index.termBanks; ++i) {
+ const bankFile = files[`term_bank_${i}.json`];
+ if (bankFile) {
+ const bank = JSON.parse(await bankFile.async('string'));
+ await termsLoaded(index.title, bank, banksTotal, banksLoaded++);
+ } else {
+ throw 'missing term bank file';
+ }
+ }
+
+ for (let i = 1; i <= index.kanjiBanks; ++i) {
+ const bankFile = files[`kanji_bank_${i}.json`];
+ if (bankFile) {
+ const bank = JSON.parse(await bankFile.async('string'));
+ await kanjiLoaded(index.title, bank, banksTotal, banksLoaded++);
+ } else {
+ throw 'missing kanji bank file';
+ }
+ }
}
}
diff --git a/ext/bg/js/deinflector.js b/ext/bg/js/deinflector.js
index 6484f953..0abde99d 100644
--- a/ext/bg/js/deinflector.js
+++ b/ext/bg/js/deinflector.js
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017 Alex Yatskov <alex@foosoft.net>
* Author: Alex Yatskov <alex@foosoft.net>
*
* This program is free software: you can redistribute it and/or modify
@@ -26,26 +26,7 @@ class Deinflection {
this.children = [];
}
- deinflect(definer, reasons) {
- const define = () => {
- return definer(this.term).then(definitions => {
- if (this.rules.length === 0) {
- this.definitions = definitions;
- } else {
- for (const rule of this.rules) {
- for (const definition of definitions) {
- if (definition.rules.includes(rule)) {
- this.definitions.push(definition);
- }
- }
- }
- }
-
- return this.definitions.length > 0;
- });
- };
-
- const promises = [];
+ async deinflect(definer, reasons) {
for (const reason in reasons) {
for (const variant of reasons[reason]) {
let accept = this.rules.length === 0;
@@ -68,20 +49,31 @@ class Deinflection {
}
const child = new Deinflection(term, {reason, rules: variant.rulesOut});
- promises.push(
- child.deinflect(definer, reasons).then(valid => valid && this.children.push(child))
- );
+ if (await child.deinflect(definer, reasons)) {
+ this.children.push(child);
+ }
}
}
- return Promise.all(promises).then(define).then(valid => {
- if (valid && this.children.length > 0) {
- const child = new Deinflection(this.term, {rules: this.rules, definitions: this.definitions});
- this.children.push(child);
+ const definitions = await definer(this.term);
+ if (this.rules.length === 0) {
+ this.definitions = definitions;
+ } else {
+ for (const rule of this.rules) {
+ for (const definition of definitions) {
+ if (definition.rules.includes(rule)) {
+ this.definitions.push(definition);
+ }
+ }
}
+ }
+
+ if (this.definitions.length > 0 && this.children.length > 0) {
+ const child = new Deinflection(this.term, {rules: this.rules, definitions: this.definitions});
+ this.children.push(child);
+ }
- return valid || this.children.length > 0;
- });
+ return this.definitions.length > 0 || this.children.length > 0;
}
gather() {
@@ -112,16 +104,16 @@ class Deinflection {
class Deinflector {
- constructor() {
- this.reasons = {};
- }
-
- setReasons(reasons) {
+ constructor(reasons) {
this.reasons = reasons;
}
- deinflect(term, definer) {
+ async deinflect(term, definer) {
const node = new Deinflection(term);
- return node.deinflect(definer, this.reasons).then(success => success ? node.gather() : []);
+ if (await node.deinflect(definer, this.reasons)) {
+ return node.gather();
+ } else {
+ return [];
+ }
}
}
diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
new file mode 100644
index 00000000..c8d431b9
--- /dev/null
+++ b/ext/bg/js/dictionary.js
@@ -0,0 +1,273 @@
+/*
+ * Copyright (C) 2016-2017 Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+function dictEnabledSet(options) {
+ const dictionaries = {};
+ for (const title in options.dictionaries) {
+ const dictionary = options.dictionaries[title];
+ if (dictionary.enabled) {
+ dictionaries[title] = dictionary;
+ }
+ }
+
+ return dictionaries;
+}
+
+function dictConfigured(options) {
+ for (const title in options.dictionaries) {
+ if (options.dictionaries[title].enabled) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+function dictRowsSort(rows, options) {
+ return rows.sort((ra, rb) => {
+ const pa = (options.dictionaries[ra.title] || {}).priority || 0;
+ const pb = (options.dictionaries[rb.title] || {}).priority || 0;
+ if (pa > pb) {
+ return -1;
+ } else if (pa < pb) {
+ return 1;
+ } else {
+ return 0;
+ }
+ });
+}
+
+function dictTermsSort(definitions, dictionaries=null) {
+ return definitions.sort((v1, v2) => {
+ const sl1 = v1.source.length;
+ const sl2 = v2.source.length;
+ if (sl1 > sl2) {
+ return -1;
+ } else if (sl1 < sl2) {
+ return 1;
+ }
+
+ if (dictionaries !== null) {
+ const p1 = (dictionaries[v1.dictionary] || {}).priority || 0;
+ const p2 = (dictionaries[v2.dictionary] || {}).priority || 0;
+ if (p1 > p2) {
+ return -1;
+ } else if (p1 < p2) {
+ return 1;
+ }
+ }
+
+ const s1 = v1.score;
+ const s2 = v2.score;
+ if (s1 > s2) {
+ return -1;
+ } else if (s1 < s2) {
+ return 1;
+ }
+
+ const rl1 = v1.reasons.length;
+ const rl2 = v2.reasons.length;
+ if (rl1 < rl2) {
+ return -1;
+ } else if (rl1 > rl2) {
+ return 1;
+ }
+
+ return v2.expression.localeCompare(v1.expression);
+ });
+}
+
+function dictTermsUndupe(definitions) {
+ const definitionGroups = {};
+ for (const definition of definitions) {
+ const definitionExisting = definitionGroups[definition.id];
+ if (!definitionGroups.hasOwnProperty(definition.id) || definition.expression.length > definitionExisting.expression.length) {
+ definitionGroups[definition.id] = definition;
+ }
+ }
+
+ const definitionsUnique = [];
+ for (const key in definitionGroups) {
+ definitionsUnique.push(definitionGroups[key]);
+ }
+
+ return definitionsUnique;
+}
+
+function dictTermsGroup(definitions, dictionaries) {
+ const groups = {};
+ for (const definition of definitions) {
+ const key = [definition.source, definition.expression].concat(definition.reasons);
+ if (definition.reading) {
+ key.push(definition.reading);
+ }
+
+ const group = groups[key];
+ if (group) {
+ group.push(definition);
+ } else {
+ groups[key] = [definition];
+ }
+ }
+
+ const results = [];
+ for (const key in groups) {
+ const groupDefs = groups[key];
+ const firstDef = groupDefs[0];
+ dictTermsSort(groupDefs, dictionaries);
+ results.push({
+ definitions: groupDefs,
+ expression: firstDef.expression,
+ reading: firstDef.reading,
+ reasons: firstDef.reasons,
+ score: groupDefs.reduce((p, v) => v.score > p ? v.score : p, Number.MIN_SAFE_INTEGER),
+ source: firstDef.source
+ });
+ }
+
+ return dictTermsSort(results);
+}
+
+function dictTagBuildSource(name) {
+ return dictTagSanitize({name, category: 'dictionary', order: 100});
+}
+
+function dictTagBuild(name, meta) {
+ const tag = {name};
+ const symbol = name.split(':')[0];
+ for (const prop in meta[symbol] || {}) {
+ tag[prop] = meta[symbol][prop];
+ }
+
+ return dictTagSanitize(tag);
+}
+
+function dictTagSanitize(tag) {
+ tag.name = tag.name || 'untitled';
+ tag.category = tag.category || 'default';
+ tag.notes = tag.notes || '';
+ tag.order = tag.order || 0;
+ return tag;
+}
+
+function dictTagsSort(tags) {
+ return tags.sort((v1, v2) => {
+ const order1 = v1.order;
+ const order2 = v2.order;
+ if (order1 < order2) {
+ return -1;
+ } else if (order1 > order2) {
+ return 1;
+ }
+
+ const name1 = v1.name;
+ const name2 = v2.name;
+ if (name1 < name2) {
+ return -1;
+ } else if (name1 > name2) {
+ return 1;
+ }
+
+ return 0;
+ });
+}
+
+function dictFieldSplit(field) {
+ return field.length === 0 ? [] : field.split(' ');
+}
+
+function dictFieldFormat(field, definition, mode, options) {
+ const markers = [
+ 'audio',
+ 'character',
+ 'cloze-body',
+ 'cloze-prefix',
+ 'cloze-suffix',
+ 'dictionary',
+ 'expression',
+ 'furigana',
+ 'glossary',
+ 'glossary-brief',
+ 'kunyomi',
+ 'onyomi',
+ 'reading',
+ 'sentence',
+ 'tags',
+ 'url'
+ ];
+
+ for (const marker of markers) {
+ const data = {
+ marker,
+ definition,
+ group: options.general.groupResults,
+ html: options.anki.htmlCards,
+ modeTermKanji: mode === 'term-kanji',
+ modeTermKana: mode === 'term-kana',
+ modeKanji: mode === 'kanji'
+ };
+
+ field = field.replace(
+ `{${marker}}`,
+ handlebarsRender('fields.html', data)
+ );
+ }
+
+ return field;
+}
+
+function dictNoteFormat(definition, mode, options) {
+ const note = {fields: {}, tags: options.anki.tags};
+ let fields = [];
+
+ if (mode === 'kanji') {
+ fields = options.anki.kanji.fields;
+ note.deckName = options.anki.kanji.deck;
+ note.modelName = options.anki.kanji.model;
+ } else {
+ fields = options.anki.terms.fields;
+ note.deckName = options.anki.terms.deck;
+ note.modelName = options.anki.terms.model;
+
+ if (definition.audio) {
+ const audio = {
+ url: definition.audio.url,
+ filename: definition.audio.filename,
+ skipHash: '7e2c2f954ef6051373ba916f000168dc',
+ fields: []
+ };
+
+ for (const name in fields) {
+ if (fields[name].includes('{audio}')) {
+ audio.fields.push(name);
+ }
+ }
+
+ if (audio.fields.length > 0) {
+ note.audio = audio;
+ }
+ }
+ }
+
+ for (const name in fields) {
+ note.fields[name] = dictFieldFormat(fields[name], definition, mode, options);
+ }
+
+ return note;
+}
diff --git a/ext/bg/js/display-window.js b/ext/bg/js/display-window.js
deleted file mode 100644
index ae97cd36..00000000
--- a/ext/bg/js/display-window.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-window.displayWindow = new class extends Display {
- constructor() {
- super($('#spinner'), $('#content'));
-
- const search = $('#search');
- search.click(this.onSearch.bind(this));
-
- const query = $('#query');
- query.on('input', () => search.prop('disabled', query.val().length === 0));
- window.wanakana.bind(query.get(0));
- }
-
- definitionAdd(definition, mode) {
- return instYomi().definitionAdd(definition, mode);
- }
-
- definitionsAddable(definitions, modes) {
- return instYomi().definitionsAddable(definitions, modes).catch(() => []);
- }
-
- templateRender(template, data) {
- return instYomi().templateRender(template, data);
- }
-
- kanjiFind(character) {
- return instYomi().kanjiFind(character);
- }
-
- handleError(error) {
- window.alert(`Error: ${error}`);
- }
-
- clearSearch() {
- $('#query').focus().select();
- }
-
- onSearch(e) {
- e.preventDefault();
- $('#intro').slideUp();
- instYomi().termsFind($('#query').val()).then(({length, definitions}) => {
- super.showTermDefs(definitions, instYomi().options);
- }).catch(this.handleError.bind(this));
- }
-};
diff --git a/ext/bg/js/handlebars.js b/ext/bg/js/handlebars.js
new file mode 100644
index 00000000..debb0690
--- /dev/null
+++ b/ext/bg/js/handlebars.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2016-2017 Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+function handlebarsEscape(text) {
+ return Handlebars.Utils.escapeExpression(text);
+}
+
+function handlebarsDumpObject(options) {
+ const dump = JSON.stringify(options.fn(this), null, 4);
+ return handlebarsEscape(dump);
+}
+
+function handlebarsKanjiLinks(options) {
+ let result = '';
+ for (const c of options.fn(this)) {
+ if (jpIsKanji(c)) {
+ result += `<a href="#" class="kanji-link">${c}</a>`;
+ } else {
+ result += c;
+ }
+ }
+
+ return result;
+}
+
+function handlebarsMultiLine(options) {
+ return options.fn(this).split('\n').join('<br>');
+}
+
+function handlebarsRender(template, data) {
+ if (Handlebars.partials !== Handlebars.templates) {
+ Handlebars.partials = Handlebars.templates;
+ Handlebars.registerHelper('dumpObject', handlebarsDumpObject);
+ Handlebars.registerHelper('kanjiLinks', handlebarsKanjiLinks);
+ Handlebars.registerHelper('multiLine', handlebarsMultiLine);
+ }
+
+ return Handlebars.templates[template](data);
+}
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 5aa18366..ea52d337 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -17,388 +17,115 @@
*/
-/*
- * General
- */
-
-function formRead() {
- return optionsLoad().then(optionsOld => {
- const optionsNew = $.extend(true, {}, optionsOld);
-
- optionsNew.general.showGuide = $('#show-usage-guide').prop('checked');
- optionsNew.general.audioSource = $('#audio-playback-source').val();
- optionsNew.general.audioVolume = parseFloat($('#audio-playback-volume').val());
- optionsNew.general.groupResults = $('#group-terms-results').prop('checked');
- optionsNew.general.debugInfo = $('#show-debug-info').prop('checked');
- optionsNew.general.showAdvanced = $('#show-advanced-options').prop('checked');
- optionsNew.general.maxResults = parseInt($('#max-displayed-results').val(), 10);
- optionsNew.general.popupWidth = parseInt($('#popup-width').val(), 10);
- optionsNew.general.popupHeight = parseInt($('#popup-height').val(), 10);
- optionsNew.general.popupOffset = parseInt($('#popup-offset').val(), 10);
-
- optionsNew.scanning.middleMouse = $('#middle-mouse-button-scan').prop('checked');
- optionsNew.scanning.selectText = $('#select-matched-text').prop('checked');
- optionsNew.scanning.alphanumeric = $('#search-alphanumeric').prop('checked');
- optionsNew.scanning.delay = parseInt($('#scan-delay').val(), 10);
- optionsNew.scanning.length = parseInt($('#scan-length').val(), 10);
- optionsNew.scanning.modifier = $('#scan-modifier-key').val();
-
- optionsNew.anki.enable = $('#anki-enable').prop('checked');
- optionsNew.anki.tags = $('#card-tags').val().split(/[,; ]+/);
- optionsNew.anki.htmlCards = $('#generate-html-cards').prop('checked');
- optionsNew.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10);
- optionsNew.anki.server = $('#interface-server').val();
-
- if (optionsOld.anki.enable && !$('#anki-error').is(':visible')) {
- optionsNew.anki.terms.deck = $('#anki-terms-deck').val();
- optionsNew.anki.terms.model = $('#anki-terms-model').val();
- optionsNew.anki.terms.fields = ankiFieldsToDict($('#terms .anki-field-value'));
- optionsNew.anki.kanji.deck = $('#anki-kanji-deck').val();
- optionsNew.anki.kanji.model = $('#anki-kanji-model').val();
- optionsNew.anki.kanji.fields = ankiFieldsToDict($('#kanji .anki-field-value'));
+function optionsSetDefaults(options) {
+ const defaults = {
+ general: {
+ enable: true,
+ audioSource: 'jpod101',
+ audioVolume: 100,
+ groupResults: true,
+ debugInfo: false,
+ maxResults: 32,
+ showAdvanced: false,
+ popupWidth: 400,
+ popupHeight: 250,
+ popupOffset: 10,
+ showGuide: true
+ },
+
+ scanning: {
+ middleMouse: true,
+ selectText: true,
+ alphanumeric: true,
+ delay: 15,
+ length: 10,
+ modifier: 'shift'
+ },
+
+ dictionaries: {},
+
+ anki: {
+ enable: false,
+ server: 'http://127.0.0.1:8765',
+ tags: ['yomichan'],
+ htmlCards: true,
+ sentenceExt: 200,
+ terms: {deck: '', model: '', fields: {}},
+ kanji: {deck: '', model: '', fields: {}}
}
+ };
- $('.dict-group').each((index, element) => {
- const dictionary = $(element);
- const title = dictionary.data('title');
- const priority = parseInt(dictionary.find('.dict-priority').val(), 10);
- const enabled = dictionary.find('.dict-enabled').prop('checked');
- optionsNew.dictionaries[title] = {priority, enabled};
- });
-
- return {optionsNew, optionsOld};
- });
-}
-
-function updateVisibility(options) {
- const general = $('#anki-general');
- if (options.anki.enable) {
- general.show();
- } else {
- general.hide();
- }
-
- const advanced = $('.options-advanced');
- if (options.general.showAdvanced) {
- advanced.show();
- } else {
- advanced.hide();
- }
-
- const debug = $('#debug');
- if (options.general.debugInfo) {
- const text = JSON.stringify(options, null, 4);
- debug.html(handlebarsEscape(text));
- debug.show();
- } else {
- debug.hide();
- }
-}
-
-function onOptionsChanged(e) {
- if (!e.originalEvent && !e.isTrigger) {
- return;
- }
-
- formRead().then(({optionsNew, optionsOld}) => {
- return optionsSave(optionsNew).then(() => {
- updateVisibility(optionsNew);
-
- const ankiUpdated =
- optionsNew.anki.enable !== optionsOld.anki.enable ||
- optionsNew.anki.server !== optionsOld.anki.server;
-
- if (ankiUpdated) {
- ankiErrorShow(null);
- ankiSpinnerShow(true);
- return ankiDeckAndModelPopulate(optionsNew);
+ const combine = (target, source) => {
+ for (const key in source) {
+ if (!target.hasOwnProperty(key)) {
+ target[key] = source[key];
}
- });
- }).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
-}
-
-$(document).ready(() => {
- handlebarsRegister();
-
- optionsLoad().then(options => {
- $('#show-usage-guide').prop('checked', options.general.showGuide);
- $('#audio-playback-source').val(options.general.audioSource);
- $('#audio-playback-volume').val(options.general.audioVolume);
- $('#group-terms-results').prop('checked', options.general.groupResults);
- $('#show-debug-info').prop('checked', options.general.debugInfo);
- $('#show-advanced-options').prop('checked', options.general.showAdvanced);
- $('#max-displayed-results').val(options.general.maxResults);
- $('#popup-width').val(options.general.popupWidth);
- $('#popup-height').val(options.general.popupHeight);
- $('#popup-offset').val(options.general.popupOffset);
-
- $('#middle-mouse-button-scan').prop('checked', options.scanning.middleMouse);
- $('#select-matched-text').prop('checked', options.scanning.selectText);
- $('#search-alphanumeric').prop('checked', options.scanning.alphanumeric);
- $('#scan-delay').val(options.scanning.delay);
- $('#scan-length').val(options.scanning.length);
- $('#scan-modifier-key').val(options.scanning.modifier);
-
- $('#dict-purge').click(onDictionaryPurge);
- $('#dict-file').change(onDictionaryImport);
-
- $('#anki-enable').prop('checked', options.anki.enable);
- $('#card-tags').val(options.anki.tags.join(' '));
- $('#generate-html-cards').prop('checked', options.anki.htmlCards);
- $('#sentence-detection-extent').val(options.anki.sentenceExt);
- $('#interface-server').val(options.anki.server);
- $('input, select').not('.anki-model').change(onOptionsChanged);
- $('.anki-model').change(onAnkiModelChanged);
-
- dictionaryGroupsPopulate(options);
- ankiDeckAndModelPopulate(options);
- updateVisibility(options);
- });
-});
-
-
-/*
- * Dictionary
- */
-
-function dictionaryErrorShow(error) {
- const dialog = $('#dict-error');
- if (error) {
- dialog.show().find('span').text(error);
- } else {
- dialog.hide();
- }
-}
-
-function dictionarySpinnerShow(show) {
- const spinner = $('#dict-spinner');
- if (show) {
- spinner.show();
- } else {
- spinner.hide();
- }
-}
-
-function dictionaryGroupsSort() {
- const dictGroups = $('#dict-groups');
- const dictGroupChildren = dictGroups.children('.dict-group').sort((ca, cb) => {
- const pa = parseInt($(ca).find('.dict-priority').val(), 10);
- const pb = parseInt($(cb).find('.dict-priority').val(), 10);
- if (pa < pb) {
- return 1;
- } else if (pa > pb) {
- return -1;
- } else {
- return 0;
}
- });
-
- dictGroups.append(dictGroupChildren);
-}
-
-function dictionaryGroupsPopulate(options) {
- dictionaryErrorShow(null);
- dictionarySpinnerShow(true);
+ };
- const dictGroups = $('#dict-groups').empty();
- const dictWarning = $('#dict-warning').hide();
+ combine(options, defaults);
+ combine(options.general, defaults.general);
+ combine(options.scanning, defaults.scanning);
+ combine(options.anki, defaults.anki);
+ combine(options.anki.terms, defaults.anki.terms);
+ combine(options.anki.kanji, defaults.anki.kanji);
- return instDb().getDictionaries().then(rows => {
- if (rows.length === 0) {
- dictWarning.show();
- }
-
- for (const row of dictRowsSort(rows, options)) {
- const dictOptions = options.dictionaries[row.title] || {enabled: false, priority: 0};
- const dictHtml = handlebarsRender('dictionary.html', {
- title: row.title,
- version: row.version,
- revision: row.revision,
- priority: dictOptions.priority,
- enabled: dictOptions.enabled
- });
-
- dictGroups.append($(dictHtml));
- }
-
- updateVisibility(options);
-
- $('.dict-enabled, .dict-priority').change(e => {
- dictionaryGroupsSort();
- onOptionsChanged(e);
- });
- }).catch(dictionaryErrorShow).then(() => dictionarySpinnerShow(false));
-}
-
-function onDictionaryPurge(e) {
- e.preventDefault();
-
- dictionaryErrorShow(null);
- dictionarySpinnerShow(true);
-
- const dictControls = $('#dict-importer, #dict-groups').hide();
- const dictProgress = $('#dict-purge-progress').show();
-
- instDb().purge().catch(dictionaryErrorShow).then(() => {
- dictionarySpinnerShow(false);
- dictControls.show();
- dictProgress.hide();
- return optionsLoad();
- }).then(options => {
- options.dictionaries = {};
- optionsSave(options).then(() => dictionaryGroupsPopulate(options));
- });
+ return options;
}
-function onDictionaryImport(e) {
- dictionaryErrorShow(null);
- dictionarySpinnerShow(true);
-
- const dictFile = $('#dict-file');
- const dictImporter = $('#dict-importer').hide();
- const dictProgress = $('#dict-import-progress').show();
- const setProgress = percent => dictProgress.find('.progress-bar').css('width', `${percent}%`);
- const updateProgress = (total, current) => setProgress(current / total * 100.0);
-
- setProgress(0.0);
-
- optionsLoad().then(options => {
- return instDb().importDictionary(e.target.files[0], updateProgress).then(summary => {
- options.dictionaries[summary.title] = {enabled: true, priority: 0};
- return optionsSave(options);
- }).then(() => dictionaryGroupsPopulate(options));
- }).catch(dictionaryErrorShow).then(() => {
- dictFile.val('');
- dictionarySpinnerShow(false);
- dictProgress.hide();
- dictImporter.show();
- });
-}
-
-/*
- * Anki
- */
+function optionsVersion(options) {
+ const fixups = [
+ () => {},
+ () => {},
+ () => {},
+ () => {},
+ () => {
+ if (options.general.audioPlayback) {
+ options.general.audioSource = 'jpod101';
+ } else {
+ options.general.audioSource = 'disabled';
+ }
+ },
+ () => {
+ options.general.showGuide = false;
+ },
+ () => {
+ if (options.scanning.requireShift) {
+ options.scanning.modifier = 'shift';
+ } else {
+ options.scanning.modifier = 'none';
+ }
+ }
+ ];
-function ankiSpinnerShow(show) {
- const spinner = $('#anki-spinner');
- if (show) {
- spinner.show();
- } else {
- spinner.hide();
+ optionsSetDefaults(options);
+ if (!options.hasOwnProperty('version')) {
+ options.version = fixups.length;
}
-}
-function ankiErrorShow(error) {
- const dialog = $('#anki-error');
- if (error) {
- dialog.show().find('span').text(error);
+ while (options.version < fixups.length) {
+ fixups[options.version++]();
}
- else {
- dialog.hide();
- }
-}
-
-function ankiFieldsToDict(selection) {
- const result = {};
- selection.each((index, element) => {
- result[$(element).data('field')] = $(element).val();
- });
-
- return result;
-}
-
-function ankiDeckAndModelPopulate(options) {
- ankiErrorShow(null);
- ankiSpinnerShow(true);
-
- const ankiFormat = $('#anki-format').hide();
- return Promise.all([instAnki().getDeckNames(), instAnki().getModelNames()]).then(([deckNames, modelNames]) => {
- const ankiDeck = $('.anki-deck');
- ankiDeck.find('option').remove();
- deckNames.sort().forEach(name => ankiDeck.append($('<option/>', {value: name, text: name})));
- $('#anki-terms-deck').val(options.anki.terms.deck);
- $('#anki-kanji-deck').val(options.anki.kanji.deck);
-
- const ankiModel = $('.anki-model');
- ankiModel.find('option').remove();
- modelNames.sort().forEach(name => ankiModel.append($('<option/>', {value: name, text: name})));
-
- return Promise.all([
- ankiFieldsPopulate($('#anki-terms-model').val(options.anki.terms.model), options),
- ankiFieldsPopulate($('#anki-kanji-model').val(options.anki.kanji.model), options)
- ]);
- }).then(() => ankiFormat.show()).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
+ return options;
}
-function ankiFieldsPopulate(element, options) {
- const tab = element.closest('.tab-pane');
- const tabId = tab.attr('id');
- const container = tab.find('tbody').empty();
-
- const modelName = element.val();
- if (modelName === null) {
- return Promise.resolve();
- }
-
- const markers = {
- 'terms': [
- 'audio',
- 'cloze-body',
- 'cloze-prefix',
- 'cloze-suffix',
- 'dictionary',
- 'expression',
- 'furigana',
- 'glossary',
- 'reading',
- 'sentence',
- 'tags',
- 'url'
- ],
- 'kanji': [
- 'character',
- 'dictionary',
- 'glossary',
- 'kunyomi',
- 'onyomi',
- 'sentence',
- 'tags',
- 'url'
- ]
- }[tabId] || {};
-
- return instAnki().getModelFieldNames(modelName).then(names => {
- names.forEach(name => {
- const value = options.anki[tabId].fields[name] || '';
- const html = Handlebars.templates['model.html']({name, markers, value});
- container.append($(html));
- });
-
- tab.find('.anki-field-value').change(onOptionsChanged);
- tab.find('.marker-link').click(e => {
- e.preventDefault();
- const link = e.target;
- $(link).closest('.input-group').find('.anki-field-value').val(`{${link.text}}`).trigger('change');
- });
+function optionsLoad() {
+ return new Promise((resolve, reject) => {
+ chrome.storage.local.get(null, store => resolve(store.options));
+ }).then(optionsStr => {
+ return optionsStr ? JSON.parse(optionsStr) : {};
+ }).catch(error => {
+ return {};
+ }).then(options => {
+ return optionsVersion(options);
});
}
-function onAnkiModelChanged(e) {
- if (!e.originalEvent) {
- return;
- }
-
- ankiErrorShow(null);
- ankiSpinnerShow(true);
-
- const element = $(this);
- formRead().then(({optionsNew, optionsOld}) => {
- const tab = element.closest('.tab-pane');
- const tabId = tab.attr('id');
- optionsNew.anki[tabId].fields = {};
- ankiFieldsPopulate(element, optionsNew).then(() => {
- optionsSave(optionsNew);
- }).catch(ankiErrorShow).then(() => ankiSpinnerShow(false));
+function optionsSave(options) {
+ return new Promise((resolve, reject) => {
+ chrome.storage.local.set({options: JSON.stringify(options)}, resolve);
+ }).then(() => {
+ apiOptionsSet(options);
});
}
diff --git a/ext/bg/js/request.js b/ext/bg/js/request.js
new file mode 100644
index 00000000..94fd135a
--- /dev/null
+++ b/ext/bg/js/request.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+function requestJson(url, action, params) {
+ return new Promise((resolve, reject) => {
+ const xhr = new XMLHttpRequest();
+ xhr.overrideMimeType('application/json');
+ xhr.addEventListener('load', () => resolve(xhr.responseText));
+ xhr.addEventListener('error', () => reject('failed to execute network request'));
+ xhr.open(action, url);
+ if (params) {
+ xhr.send(JSON.stringify(params));
+ } else {
+ xhr.send();
+ }
+ }).then(responseText => {
+ try {
+ return JSON.parse(responseText);
+ }
+ catch (e) {
+ return Promise.reject('invalid JSON response');
+ }
+ });
+}
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
new file mode 100644
index 00000000..54cda8ec
--- /dev/null
+++ b/ext/bg/js/search.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2016-2017 Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+class DisplaySearch extends Display {
+ constructor() {
+ super($('#spinner'), $('#content'));
+
+ this.search = $('#search').click(this.onSearch.bind(this));
+ this.query = $('#query').on('input', this.onSearchInput.bind(this));
+ this.intro = $('#intro');
+
+ window.wanakana.bind(this.query.get(0));
+ }
+
+ onError(error) {
+ window.alert(`Error: ${error}`);
+ }
+
+ onSearchClear() {
+ this.query.focus().select();
+ }
+
+ onSearchInput() {
+ this.search.prop('disabled', this.query.val().length === 0);
+ }
+
+ async onSearch(e) {
+ try {
+ e.preventDefault();
+ this.intro.slideUp();
+ const {length, definitions} = await apiTermsFind(this.query.val());
+ super.termsShow(definitions, await apiOptionsGet());
+ } catch (e) {
+ this.onError(e);
+ }
+ }
+}
+
+window.yomichan_search = new DisplaySearch();
diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
new file mode 100644
index 00000000..7bdd9f84
--- /dev/null
+++ b/ext/bg/js/settings.js
@@ -0,0 +1,432 @@
+/*
+ * Copyright (C) 2016-2017 Alex Yatskov <alex@foosoft.net>
+ * Author: Alex Yatskov <alex@foosoft.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+async function formRead() {
+ const optionsOld = await optionsLoad();
+ const optionsNew = $.extend(true, {}, optionsOld);
+
+ optionsNew.general.showGuide = $('#show-usage-guide').prop('checked');
+ optionsNew.general.audioSource = $('#audio-playback-source').val();
+ optionsNew.general.audioVolume = parseFloat($('#audio-playback-volume').val());
+ optionsNew.general.groupResults = $('#group-terms-results').prop('checked');
+ optionsNew.general.debugInfo = $('#show-debug-info').prop('checked');
+ optionsNew.general.showAdvanced = $('#show-advanced-options').prop('checked');
+ optionsNew.general.maxResults = parseInt($('#max-displayed-results').val(), 10);
+ optionsNew.general.popupWidth = parseInt($('#popup-width').val(), 10);
+ optionsNew.general.popupHeight = parseInt($('#popup-height').val(), 10);
+ optionsNew.general.popupOffset = parseInt($('#popup-offset').val(), 10);
+
+ optionsNew.scanning.middleMouse = $('#middle-mouse-button-scan').prop('checked');
+ optionsNew.scanning.selectText = $('#select-matched-text').prop('checked');
+ optionsNew.scanning.alphanumeric = $('#search-alphanumeric').prop('checked');
+ optionsNew.scanning.delay = parseInt($('#scan-delay').val(), 10);
+ optionsNew.scanning.length = parseInt($('#scan-length').val(), 10);
+ optionsNew.scanning.modifier = $('#scan-modifier-key').val();
+
+ optionsNew.anki.enable = $('#anki-enable').prop('checked');
+ optionsNew.anki.tags = $('#card-tags').val().split(/[,; ]+/);
+ optionsNew.anki.htmlCards = $('#generate-html-cards').prop('checked');
+ optionsNew.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10);
+ optionsNew.anki.server = $('#interface-server').val();
+
+ if (optionsOld.anki.enable && !ankiErrorShown()) {
+ optionsNew.anki.terms.deck = $('#anki-terms-deck').val();
+ optionsNew.anki.terms.model = $('#anki-terms-model').val();
+ optionsNew.anki.terms.fields = ankiFieldsToDict($('#terms .anki-field-value'));
+ optionsNew.anki.kanji.deck = $('#anki-kanji-deck').val();
+ optionsNew.anki.kanji.model = $('#anki-kanji-model').val();
+ optionsNew.anki.kanji.fields = ankiFieldsToDict($('#kanji .anki-field-value'));
+ }
+
+ $('.dict-group').each((index, element) => {
+ const dictionary = $(element);
+ const title = dictionary.data('title');
+ const priority = parseInt(dictionary.find('.dict-priority').val(), 10);
+ const enabled = dictionary.find('.dict-enabled').prop('checked');
+ optionsNew.dictionaries[title] = {priority, enabled};
+ });
+
+ return {optionsNew, optionsOld};
+}
+
+function formUpdateVisibility(options) {
+ const general = $('#anki-general');
+ if (options.anki.enable) {
+ general.show();
+ } else {
+ general.hide();
+ }
+
+ const advanced = $('.options-advanced');
+ if (options.general.showAdvanced) {
+ advanced.show();
+ } else {
+ advanced.hide();
+ }
+
+ const debug = $('#debug');
+ if (options.general.debugInfo) {
+ const text = JSON.stringify(options, null, 4);
+ debug.html(handlebarsEscape(text));
+ debug.show();
+ } else {
+ debug.hide();
+ }
+}
+
+async function onFormOptionsChanged(e) {
+ try {
+ if (!e.originalEvent && !e.isTrigger) {
+ return;
+ }
+
+ const {optionsNew, optionsOld} = await formRead();
+ await optionsSave(optionsNew);
+
+ formUpdateVisibility(optionsNew);
+
+ const ankiUpdated =
+ optionsNew.anki.enable !== optionsOld.anki.enable ||
+ optionsNew.anki.server !== optionsOld.anki.server;
+
+ if (ankiUpdated) {
+ ankiSpinnerShow(true);
+ await ankiDeckAndModelPopulate(optionsNew);
+ ankiErrorShow();
+ }
+ } catch (e) {
+ ankiErrorShow(e);
+ } finally {
+ ankiSpinnerShow(false);
+ }
+}
+
+async function onReady() {
+ const options = await optionsLoad();
+
+ $('#show-usage-guide').prop('checked', options.general.showGuide);
+ $('#audio-playback-source').val(options.general.audioSource);
+ $('#audio-playback-volume').val(options.general.audioVolume);
+ $('#group-terms-results').prop('checked', options.general.groupResults);
+ $('#show-debug-info').prop('checked', options.general.debugInfo);
+ $('#show-advanced-options').prop('checked', options.general.showAdvanced);
+ $('#max-displayed-results').val(options.general.maxResults);
+ $('#popup-width').val(options.general.popupWidth);
+ $('#popup-height').val(options.general.popupHeight);
+ $('#popup-offset').val(options.general.popupOffset);
+
+ $('#middle-mouse-button-scan').prop('checked', options.scanning.middleMouse);
+ $('#select-matched-text').prop('checked', options.scanning.selectText);
+ $('#search-alphanumeric').prop('checked', options.scanning.alphanumeric);
+ $('#scan-delay').val(options.scanning.delay);
+ $('#scan-length').val(options.scanning.length);
+ $('#scan-modifier-key').val(options.scanning.modifier);
+
+ $('#dict-purge').click(utilAsync(onDictionaryPurge));
+ $('#dict-file').change(utilAsync(onDictionaryImport));
+
+ $('#anki-enable').prop('checked', options.anki.enable);
+ $('#card-tags').val(options.anki.tags.join(' '));
+ $('#generate-html-cards').prop('checked', options.anki.htmlCards);
+ $('#sentence-detection-extent').val(options.anki.sentenceExt);
+ $('#interface-server').val(options.anki.server);
+ $('input, select').not('.anki-model').change(utilAsync(onFormOptionsChanged));
+ $('.anki-model').change(utilAsync(onAnkiModelChanged));
+
+ try {
+ await dictionaryGroupsPopulate(options);
+ } catch (e) {
+ dictionaryErrorShow(e);
+ }
+
+ try {
+ await ankiDeckAndModelPopulate(options);
+ } catch (e) {
+ ankiErrorShow(e);
+ }
+
+ formUpdateVisibility(options);
+}
+
+$(document).ready(utilAsync(onReady));
+
+
+/*
+ * Dictionary
+ */
+
+function dictionaryErrorShow(error) {
+ const dialog = $('#dict-error');
+ if (error) {
+ dialog.show().find('span').text(error);
+ } else {
+ dialog.hide();
+ }
+}
+
+function dictionarySpinnerShow(show) {
+ const spinner = $('#dict-spinner');
+ if (show) {
+ spinner.show();
+ } else {
+ spinner.hide();
+ }
+}
+
+function dictionaryGroupsSort() {
+ const dictGroups = $('#dict-groups');
+ const dictGroupChildren = dictGroups.children('.dict-group').sort((ca, cb) => {
+ const pa = parseInt($(ca).find('.dict-priority').val(), 10);
+ const pb = parseInt($(cb).find('.dict-priority').val(), 10);
+ if (pa < pb) {
+ return 1;
+ } else if (pa > pb) {
+ return -1;
+ } else {
+ return 0;
+ }
+ });
+
+ dictGroups.append(dictGroupChildren);
+}
+
+async function dictionaryGroupsPopulate(options) {
+ const dictGroups = $('#dict-groups').empty();
+ const dictWarning = $('#dict-warning').hide();
+
+ const dictRows = await utilDatabaseGetDictionaries();
+ if (dictRows.length === 0) {
+ dictWarning.show();
+ }
+
+ for (const dictRow of dictRowsSort(dictRows, options)) {
+ const dictOptions = options.dictionaries[dictRow.title] || {enabled: false, priority: 0};
+ const dictHtml = handlebarsRender('dictionary.html', {
+ title: dictRow.title,
+ version: dictRow.version,
+ revision: dictRow.revision,
+ priority: dictOptions.priority,
+ enabled: dictOptions.enabled
+ });
+
+ dictGroups.append($(dictHtml));
+ }
+
+ formUpdateVisibility(options);
+
+ $('.dict-enabled, .dict-priority').change(e => {
+ dictionaryGroupsSort();
+ onFormOptionsChanged(e);
+ });
+}
+
+async function onDictionaryPurge(e) {
+ e.preventDefault();
+
+ const dictControls = $('#dict-importer, #dict-groups').hide();
+ const dictProgress = $('#dict-purge-progress').show();
+
+ try {
+ dictionaryErrorShow();
+ dictionarySpinnerShow(true);
+
+ await utilDatabasePurge();
+ const options = await optionsLoad();
+ options.dictionaries = {};
+ await optionsSave(options);
+
+ await dictionaryGroupsPopulate(options);
+ } catch (e) {
+ dictionaryErrorShow(e);
+ } finally {
+ dictionarySpinnerShow(false);
+
+ dictControls.show();
+ dictProgress.hide();
+ }
+}
+
+async function onDictionaryImport(e) {
+ const dictFile = $('#dict-file');
+ const dictControls = $('#dict-importer').hide();
+ const dictProgress = $('#dict-import-progress').show();
+
+ try {
+ dictionaryErrorShow();
+ dictionarySpinnerShow(true);
+
+ const setProgress = percent => dictProgress.find('.progress-bar').css('width', `${percent}%`);
+ const updateProgress = (total, current) => setProgress(current / total * 100.0);
+ setProgress(0.0);
+
+ const options = await optionsLoad();
+ const summary = await utilDatabaseImport(e.target.files[0], updateProgress);
+ options.dictionaries[summary.title] = {enabled: true, priority: 0};
+ await optionsSave(options);
+
+ await dictionaryGroupsPopulate(options);
+ } catch (e) {
+ dictionaryErrorShow(e);
+ } finally {
+ dictionarySpinnerShow(false);
+
+ dictFile.val('');
+ dictControls.show();
+ dictProgress.hide();
+ }
+}
+
+
+/*
+ * Anki
+ */
+
+function ankiSpinnerShow(show) {
+ const spinner = $('#anki-spinner');
+ if (show) {
+ spinner.show();
+ } else {
+ spinner.hide();
+ }
+}
+
+function ankiErrorShow(error) {
+ const dialog = $('#anki-error');
+ if (error) {
+ dialog.show().find('span').text(error);
+ }
+ else {
+ dialog.hide();
+ }
+}
+
+function ankiErrorShown() {
+ return $('#anki-error').is(':visible');
+}
+
+function ankiFieldsToDict(selection) {
+ const result = {};
+ selection.each((index, element) => {
+ result[$(element).data('field')] = $(element).val();
+ });
+
+ return result;
+}
+
+async function ankiDeckAndModelPopulate(options) {
+ const ankiFormat = $('#anki-format').hide();
+ const ankiTermsModel = $('#anki-terms-model').val(options.anki.terms.model);
+ const ankiKanjiModel = $('#anki-kanji-model').val(options.anki.kanji.model);
+
+ $('#anki-terms-deck').val(options.anki.terms.deck);
+ $('#anki-kanji-deck').val(options.anki.kanji.deck);
+
+ const deckNames = await utilAnkiGetDeckNames();
+ const ankiDeck = $('.anki-deck');
+ ankiDeck.find('option').remove();
+ deckNames.sort().forEach(name => ankiDeck.append($('<option/>', {value: name, text: name})));
+
+ const modelNames = await utilAnkiGetModelNames();
+ const ankiModel = $('.anki-model');
+ ankiModel.find('option').remove();
+ modelNames.sort().forEach(name => ankiModel.append($('<option/>', {value: name, text: name})));
+
+ await ankiFieldsPopulate(ankiTermsModel, options);
+ await ankiFieldsPopulate(ankiKanjiModel, options);
+
+ ankiFormat.show();
+}
+
+async function ankiFieldsPopulate(element, options) {
+ const modelName = element.val();
+ if (!modelName) {
+ return;
+ }
+
+ const tab = element.closest('.tab-pane');
+ const tabId = tab.attr('id');
+ const container = tab.find('tbody').empty();
+
+ const markers = {
+ 'terms': [
+ 'audio',
+ 'cloze-body',
+ 'cloze-prefix',
+ 'cloze-suffix',
+ 'dictionary',
+ 'expression',
+ 'furigana',
+ 'glossary',
+ 'glossary-brief',
+ 'reading',
+ 'sentence',
+ 'tags',
+ 'url'
+ ],
+ 'kanji': [
+ 'character',
+ 'dictionary',
+ 'glossary',
+ 'kunyomi',
+ 'onyomi',
+ 'sentence',
+ 'tags',
+ 'url'
+ ]
+ }[tabId] || {};
+
+ for (const name of await utilAnkiGetModelFieldNames(modelName)) {
+ const value = options.anki[tabId].fields[name] || '';
+ const html = Handlebars.templates['model.html']({name, markers, value});
+ container.append($(html));
+ }
+
+ tab.find('.anki-field-value').change(utilAsync(onFormOptionsChanged));
+ tab.find('.marker-link').click(onAnkiMarkerClicked);
+}
+
+function onAnkiMarkerClicked(e) {
+ e.preventDefault();
+ const link = e.target;
+ $(link).closest('.input-group').find('.anki-field-value').val(`{${link.text}}`).trigger('change');
+}
+
+async function onAnkiModelChanged(e) {
+ try {
+ if (!e.originalEvent) {
+ return;
+ }
+
+ const element = $(this);
+ const tab = element.closest('.tab-pane');
+ const tabId = tab.attr('id');
+
+ const {optionsNew, optionsOld} = await formRead();
+ optionsNew.anki[tabId].fields = {};
+ await optionsSave(optionsNew);
+
+ ankiSpinnerShow(true);
+ await ankiFieldsPopulate(element, optionsNew);
+ ankiErrorShow();
+ } catch (e) {
+ ankiErrorShow(e);
+ } finally {
+ ankiSpinnerShow(false);
+ }
+}
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index f10134ee..7e05015a 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -3,7 +3,7 @@
templates['dictionary.html'] = template({"1":function(container,depth0,helpers,partials,data) {
return "checked";
},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
- var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+ var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
return "<div class=\"dict-group well well-sm\" data-title=\""
+ alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
@@ -24,106 +24,114 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
templates['fields.html'] = template({"1":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(14, data, 0),"data":data})) != null ? stack1 : "");
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.program(15, data, 0),"data":data})) != null ? stack1 : "");
},"2":function(container,depth0,helpers,partials,data) {
- var stack1, alias1=depth0 != null ? depth0 : {};
+ var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
- return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
- + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(7, data, 0),"inverse":container.program(11, data, 0),"data":data})) != null ? stack1 : "");
+ return ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.brief : depth0),{"name":"unless","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.program(12, data, 0),"data":data})) != null ? stack1 : "");
},"3":function(container,depth0,helpers,partials,data) {
var stack1;
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"4":function(container,depth0,helpers,partials,data) {
+ var stack1;
+
return "<i>("
- + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ ")</i> ";
-},"4":function(container,depth0,helpers,partials,data) {
- var stack1, helper, alias1=depth0 != null ? depth0 : {};
+},"5":function(container,depth0,helpers,partials,data) {
+ var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {});
return container.escapeExpression(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
- + ((stack1 = helpers.unless.call(alias1,(data && data.last),{"name":"unless","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"5":function(container,depth0,helpers,partials,data) {
+ + ((stack1 = helpers.unless.call(alias1,(data && data.last),{"name":"unless","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"6":function(container,depth0,helpers,partials,data) {
return ", ";
-},"7":function(container,depth0,helpers,partials,data) {
+},"8":function(container,depth0,helpers,partials,data) {
var stack1;
return "<ul>"
- + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "</ul>";
-},"8":function(container,depth0,helpers,partials,data) {
+},"9":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, buffer =
"<li>";
- stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+ stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
if (stack1 != null) { buffer += stack1; }
return buffer + "</li>";
-},"9":function(container,depth0,helpers,partials,data) {
+},"10":function(container,depth0,helpers,partials,data) {
return container.escapeExpression(container.lambda(depth0, depth0));
-},"11":function(container,depth0,helpers,partials,data) {
+},"12":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, buffer = "";
- stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+ stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
if (stack1 != null) { buffer += stack1; }
return buffer;
-},"12":function(container,depth0,helpers,partials,data) {
+},"13":function(container,depth0,helpers,partials,data) {
var stack1;
return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0));
-},"14":function(container,depth0,helpers,partials,data) {
- var stack1, alias1=depth0 != null ? depth0 : {};
-
- return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
- + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.program(12, data, 0),"data":data})) != null ? stack1 : "");
},"15":function(container,depth0,helpers,partials,data) {
+ var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
+
+ return ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.brief : depth0),{"name":"unless","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(19, data, 0),"inverse":container.program(13, data, 0),"data":data})) != null ? stack1 : "");
+},"16":function(container,depth0,helpers,partials,data) {
+ var stack1;
+
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"17":function(container,depth0,helpers,partials,data) {
var stack1;
return "("
- + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ ") ";
-},"17":function(container,depth0,helpers,partials,data) {
+},"19":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"18":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"20":function(container,depth0,helpers,partials,data) {
var stack1;
return container.escapeExpression(container.lambda(depth0, depth0))
- + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"20":function(container,depth0,helpers,partials,data) {
- return "";
+ + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.last),{"name":"unless","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
},"22":function(container,depth0,helpers,partials,data) {
+ return "";
+},"24":function(container,depth0,helpers,partials,data) {
var stack1;
return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.character : stack1), depth0));
-},"24":function(container,depth0,helpers,partials,data) {
+},"26":function(container,depth0,helpers,partials,data) {
var stack1;
return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.dictionary : stack1), depth0));
-},"26":function(container,depth0,helpers,partials,data) {
+},"28":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.modeTermKana : depth0),{"name":"if","hash":{},"fn":container.program(27, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
-},"27":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.modeTermKana : depth0),{"name":"if","hash":{},"fn":container.program(29, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+},"29":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(28, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
-},"28":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(30, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+},"30":function(container,depth0,helpers,partials,data) {
var stack1;
return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1), depth0));
-},"30":function(container,depth0,helpers,partials,data) {
+},"32":function(container,depth0,helpers,partials,data) {
var stack1;
return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.expression : stack1), depth0));
-},"32":function(container,depth0,helpers,partials,data) {
+},"34":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(33, data, 0),"inverse":container.program(36, data, 0),"data":data})) != null ? stack1 : "");
-},"33":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(35, data, 0),"inverse":container.program(38, data, 0),"data":data})) != null ? stack1 : "");
+},"35":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(34, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
-},"34":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(36, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+},"36":function(container,depth0,helpers,partials,data) {
var stack1, alias1=container.lambda, alias2=container.escapeExpression;
return "<ruby>"
@@ -131,147 +139,151 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
+ "<rt>"
+ alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1), depth0))
+ "</rt></ruby>";
-},"36":function(container,depth0,helpers,partials,data) {
+},"38":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(37, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
-},"37":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1),{"name":"if","hash":{},"fn":container.program(39, data, 0),"inverse":container.program(32, data, 0),"data":data})) != null ? stack1 : "");
+},"39":function(container,depth0,helpers,partials,data) {
var stack1, alias1=container.lambda, alias2=container.escapeExpression;
return alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.expression : stack1), depth0))
+ " ["
+ alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.reading : stack1), depth0))
+ "]";
-},"39":function(container,depth0,helpers,partials,data,blockParams,depths) {
- var stack1, alias1=depth0 != null ? depth0 : {};
+},"41":function(container,depth0,helpers,partials,data,blockParams,depths) {
+ var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
- return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(40, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
- + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.modeKanji : depth0),{"name":"if","hash":{},"fn":container.program(42, data, 0, blockParams, depths),"inverse":container.program(51, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
- + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(64, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"40":function(container,depth0,helpers,partials,data) {
- return "<div style=\"text-align: left;\">";
+ return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(42, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.modeKanji : depth0),{"name":"if","hash":{},"fn":container.program(44, data, 0, blockParams, depths),"inverse":container.program(53, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(66, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
},"42":function(container,depth0,helpers,partials,data) {
+ return "<div style=\"text-align: left;\">";
+},"44":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(43, data, 0),"inverse":container.program(49, data, 0),"data":data})) != null ? stack1 : "");
-},"43":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(45, data, 0),"inverse":container.program(51, data, 0),"data":data})) != null ? stack1 : "");
+},"45":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(44, data, 0),"inverse":container.program(47, data, 0),"data":data})) != null ? stack1 : "");
-},"44":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(46, data, 0),"inverse":container.program(49, data, 0),"data":data})) != null ? stack1 : "");
+},"46":function(container,depth0,helpers,partials,data) {
var stack1;
return "<ol>"
- + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(45, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(47, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "</ol>";
-},"45":function(container,depth0,helpers,partials,data) {
+},"47":function(container,depth0,helpers,partials,data) {
return "<li>"
+ container.escapeExpression(container.lambda(depth0, depth0))
+ "</li>";
-},"47":function(container,depth0,helpers,partials,data) {
+},"49":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"49":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"51":function(container,depth0,helpers,partials,data) {
var stack1;
return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.glossary : stack1)) != null ? stack1["0"] : stack1), depth0));
-},"51":function(container,depth0,helpers,partials,data,blockParams,depths) {
+},"53":function(container,depth0,helpers,partials,data,blockParams,depths) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.group : depth0),{"name":"if","hash":{},"fn":container.program(52, data, 0, blockParams, depths),"inverse":container.program(62, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
-},"52":function(container,depth0,helpers,partials,data,blockParams,depths) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.group : depth0),{"name":"if","hash":{},"fn":container.program(54, data, 0, blockParams, depths),"inverse":container.program(64, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+},"54":function(container,depth0,helpers,partials,data,blockParams,depths) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(53, data, 0, blockParams, depths),"inverse":container.program(60, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
-},"53":function(container,depth0,helpers,partials,data,blockParams,depths) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(55, data, 0, blockParams, depths),"inverse":container.program(62, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+},"55":function(container,depth0,helpers,partials,data,blockParams,depths) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(54, data, 0, blockParams, depths),"inverse":container.program(57, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
-},"54":function(container,depth0,helpers,partials,data,blockParams,depths) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(56, data, 0, blockParams, depths),"inverse":container.program(59, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+},"56":function(container,depth0,helpers,partials,data,blockParams,depths) {
var stack1;
return "<ol>"
- + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(55, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(57, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "</ol>";
-},"55":function(container,depth0,helpers,partials,data,blockParams,depths) {
+},"57":function(container,depth0,helpers,partials,data,blockParams,depths) {
var stack1;
return "<li>"
- + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","hash":{"html":(depths[1] != null ? depths[1].html : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
+ + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","hash":{"brief":(depths[1] != null ? depths[1].brief : depths[1]),"html":(depths[1] != null ? depths[1].html : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
+ "</li>";
-},"57":function(container,depth0,helpers,partials,data,blockParams,depths) {
+},"59":function(container,depth0,helpers,partials,data,blockParams,depths) {
var stack1;
- return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(58, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"58":function(container,depth0,helpers,partials,data,blockParams,depths) {
+ return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1),{"name":"each","hash":{},"fn":container.program(60, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"60":function(container,depth0,helpers,partials,data,blockParams,depths) {
var stack1;
return " * "
- + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","hash":{"html":(depths[1] != null ? depths[1].html : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
-},"60":function(container,depth0,helpers,partials,data) {
- var stack1;
-
- return ((stack1 = container.invokePartial(partials["glossary-single"],((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["0"] : stack1),{"name":"glossary-single","hash":{"html":(depth0 != null ? depth0.html : depth0)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+ + ((stack1 = container.invokePartial(partials["glossary-single"],depth0,{"name":"glossary-single","hash":{"brief":(depths[1] != null ? depths[1].brief : depths[1]),"html":(depths[1] != null ? depths[1].html : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
},"62":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = container.invokePartial(partials["glossary-single"],(depth0 != null ? depth0.definition : depth0),{"name":"glossary-single","hash":{"html":(depth0 != null ? depth0.html : depth0)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+ return ((stack1 = container.invokePartial(partials["glossary-single"],((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.definitions : stack1)) != null ? stack1["0"] : stack1),{"name":"glossary-single","hash":{"brief":(depth0 != null ? depth0.brief : depth0),"html":(depth0 != null ? depth0.html : depth0)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
},"64":function(container,depth0,helpers,partials,data) {
- return "</div>";
-},"66":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.kunyomi : stack1),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+ return ((stack1 = container.invokePartial(partials["glossary-single"],(depth0 != null ? depth0.definition : depth0),{"name":"glossary-single","hash":{"brief":(depth0 != null ? depth0.brief : depth0),"html":(depth0 != null ? depth0.html : depth0)},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+},"66":function(container,depth0,helpers,partials,data) {
+ return "</div>";
},"68":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.onyomi : stack1),{"name":"each","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+ return ((stack1 = container.invokePartial(partials.glossary,depth0,{"name":"glossary","hash":{"brief":true},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
},"70":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.modeTermKana : depth0),{"name":"unless","hash":{},"fn":container.program(28, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+ return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.kunyomi : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
},"72":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(73, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"73":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.onyomi : stack1),{"name":"each","hash":{},"fn":container.program(20, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"74":function(container,depth0,helpers,partials,data) {
+ var stack1;
+
+ return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.modeTermKana : depth0),{"name":"unless","hash":{},"fn":container.program(30, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"76":function(container,depth0,helpers,partials,data) {
+ var stack1;
+
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(77, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"77":function(container,depth0,helpers,partials,data) {
var stack1;
return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1)) != null ? stack1.sentence : stack1), depth0));
-},"75":function(container,depth0,helpers,partials,data) {
+},"79":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(76, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"76":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(80, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"80":function(container,depth0,helpers,partials,data) {
var stack1;
return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1)) != null ? stack1.prefix : stack1), depth0));
-},"78":function(container,depth0,helpers,partials,data) {
+},"82":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(79, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"79":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(83, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"83":function(container,depth0,helpers,partials,data) {
var stack1;
return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1)) != null ? stack1.body : stack1), depth0));
-},"81":function(container,depth0,helpers,partials,data) {
+},"85":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(82, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"82":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1),{"name":"if","hash":{},"fn":container.program(86, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"86":function(container,depth0,helpers,partials,data) {
var stack1;
return container.escapeExpression(container.lambda(((stack1 = ((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.cloze : stack1)) != null ? stack1.suffix : stack1), depth0));
-},"84":function(container,depth0,helpers,partials,data) {
+},"88":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.tags : stack1),{"name":"each","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"86":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.tags : stack1),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"90":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(87, data, 0),"inverse":container.program(89, data, 0),"data":data})) != null ? stack1 : "");
-},"87":function(container,depth0,helpers,partials,data) {
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.html : depth0),{"name":"if","hash":{},"fn":container.program(91, data, 0),"inverse":container.program(93, data, 0),"data":data})) != null ? stack1 : "");
+},"91":function(container,depth0,helpers,partials,data) {
var stack1, alias1=container.lambda, alias2=container.escapeExpression;
return "<a href=\""
@@ -279,46 +291,47 @@ templates['fields.html'] = template({"1":function(container,depth0,helpers,parti
+ "\">"
+ alias2(alias1(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.url : stack1), depth0))
+ "</a>";
-},"89":function(container,depth0,helpers,partials,data) {
+},"93":function(container,depth0,helpers,partials,data) {
var stack1;
return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.definition : depth0)) != null ? stack1.url : stack1), depth0));
},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
var stack1;
- return "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
- + ((stack1 = container.invokePartial(helpers.lookup.call(depth0 != null ? depth0 : {},depth0,"marker",{"name":"lookup","hash":{},"data":data}),depth0,{"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+ return "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
+ + ((stack1 = container.invokePartial(helpers.lookup.call(depth0 != null ? depth0 : (container.nullContext || {}),depth0,"marker",{"name":"lookup","hash":{},"data":data}),depth0,{"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
},"main_d": function(fn, props, container, depth0, data, blockParams, depths) {
var decorators = container.decorators;
fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary-single"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(20, data, 0, blockParams, depths),"inverse":container.noop,"args":["audio"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"args":["character"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(24, data, 0, blockParams, depths),"inverse":container.noop,"args":["dictionary"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(26, data, 0, blockParams, depths),"inverse":container.noop,"args":["expression"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(32, data, 0, blockParams, depths),"inverse":container.noop,"args":["furigana"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(39, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(66, data, 0, blockParams, depths),"inverse":container.noop,"args":["kunyomi"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(68, data, 0, blockParams, depths),"inverse":container.noop,"args":["onyomi"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(70, data, 0, blockParams, depths),"inverse":container.noop,"args":["reading"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(72, data, 0, blockParams, depths),"inverse":container.noop,"args":["sentence"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(75, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-prefix"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(78, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-body"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(81, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-suffix"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(84, data, 0, blockParams, depths),"inverse":container.noop,"args":["tags"],"data":data}) || fn;
- fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(86, data, 0, blockParams, depths),"inverse":container.noop,"args":["url"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"args":["audio"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(24, data, 0, blockParams, depths),"inverse":container.noop,"args":["character"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(26, data, 0, blockParams, depths),"inverse":container.noop,"args":["dictionary"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(28, data, 0, blockParams, depths),"inverse":container.noop,"args":["expression"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(34, data, 0, blockParams, depths),"inverse":container.noop,"args":["furigana"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(41, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(68, data, 0, blockParams, depths),"inverse":container.noop,"args":["glossary-brief"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(70, data, 0, blockParams, depths),"inverse":container.noop,"args":["kunyomi"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(72, data, 0, blockParams, depths),"inverse":container.noop,"args":["onyomi"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(74, data, 0, blockParams, depths),"inverse":container.noop,"args":["reading"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(76, data, 0, blockParams, depths),"inverse":container.noop,"args":["sentence"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(79, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-prefix"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(82, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-body"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(85, data, 0, blockParams, depths),"inverse":container.noop,"args":["cloze-suffix"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(88, data, 0, blockParams, depths),"inverse":container.noop,"args":["tags"],"data":data}) || fn;
+ fn = decorators.inline(fn,props,container,{"name":"inline","hash":{},"fn":container.program(90, data, 0, blockParams, depths),"inverse":container.noop,"args":["url"],"data":data}) || fn;
return fn;
}
,"useDecorators":true,"usePartial":true,"useData":true,"useDepths":true});
templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data) {
- var stack1, helper, alias1=depth0 != null ? depth0 : {};
+ var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {});
- return "<div class=\"entry\" data-type=\"kanji\">\n <div class=\"actions\">\n <img src=\"/mixed/img/entry-current.png\" class=\"current\" title=\"Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)\" alt>\n"
+ return "<div class=\"entry\" data-type=\"kanji\">\n <div class=\"actions\">\n"
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.source : depth0),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
- + " </div>\n\n <div class=\"glyph\">"
+ + " <img src=\"/mixed/img/entry-current.png\" class=\"current\" title=\"Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)\" alt>\n </div>\n\n <div class=\"glyph\">"
+ container.escapeExpression(((helper = (helper = helpers.character || (depth0 != null ? depth0.character : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"character","hash":{},"data":data}) : helper)))
+ "</div>\n\n <div class=\"reading\">\n <table>\n <tr>\n <th>Kunyomi:</th>\n <td>\n"
+ ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.kunyomi : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
@@ -332,7 +345,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.debug : depth0),{"name":"if","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "</div>\n";
},"2":function(container,depth0,helpers,partials,data) {
- return " <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"kanji\"><img src=\"/mixed/img/add-kanji.png\" title=\"Add Kanji (Alt + K)\" alt></a>\n";
+ return " <a href=\"#\" class=\"action-view-note pending disabled\"><img src=\"/mixed/img/view-note.png\" title=\"View added note (Alt + V)\" alt></a>\n <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"kanji\"><img src=\"/mixed/img/add-kanji.png\" title=\"Add Kanji (Alt + K)\" alt></a>\n";
},"4":function(container,depth0,helpers,partials,data) {
return " <a href=\"#\" class=\"source-term\"><img src=\"/mixed/img/source-term.png\" title=\"Source term (Alt + B)\" alt></a>\n";
},"6":function(container,depth0,helpers,partials,data) {
@@ -340,12 +353,12 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
return " "
+ container.escapeExpression(container.lambda(depth0, depth0))
- + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.last),{"name":"unless","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "\n";
},"7":function(container,depth0,helpers,partials,data) {
return ", ";
},"9":function(container,depth0,helpers,partials,data) {
- var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+ var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
return " <span class=\"label label-default tag-"
+ alias4(((helper = (helper = helpers.category || (depth0 != null ? depth0.category : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"category","hash":{},"data":data}) : helper)))
@@ -358,12 +371,12 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
var stack1;
return " <ol>\n"
- + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ " </ol>\n";
},"12":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, buffer =
" <li><span class=\"glossary-item\">";
- stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+ stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
if (stack1 != null) { buffer += stack1; }
return buffer + "</span></li>\n";
@@ -372,7 +385,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
},"15":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, buffer =
" <div class=\"glossary-item\">";
- stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+ stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
if (stack1 != null) { buffer += stack1; }
return buffer + "</div>\n";
@@ -383,7 +396,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
},"18":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, buffer =
" <pre>";
- stack1 = ((helper = (helper = helpers.dumpObject || (depth0 != null ? depth0.dumpObject : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"dumpObject","hash":{},"fn":container.program(19, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+ stack1 = ((helper = (helper = helpers.dumpObject || (depth0 != null ? depth0.dumpObject : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"dumpObject","hash":{},"fn":container.program(19, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
if (!helpers.dumpObject) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
if (stack1 != null) { buffer += stack1; }
return buffer + "</pre>\n";
@@ -394,11 +407,11 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
},"21":function(container,depth0,helpers,partials,data,blockParams,depths) {
var stack1;
- return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+ return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(22, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
},"22":function(container,depth0,helpers,partials,data,blockParams,depths) {
var stack1;
- return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.first),{"name":"unless","hash":{},"fn":container.program(23, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.first),{"name":"unless","hash":{},"fn":container.program(23, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "\n"
+ ((stack1 = container.invokePartial(partials.kanji,depth0,{"name":"kanji","hash":{"root":(depths[1] != null ? depths[1].root : depths[1]),"source":(depths[1] != null ? depths[1].source : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1]),"debug":(depths[1] != null ? depths[1].debug : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
},"23":function(container,depth0,helpers,partials,data) {
@@ -409,7 +422,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
var stack1;
return "\n"
- + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(21, data, 0, blockParams, depths),"inverse":container.program(25, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+ + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(21, data, 0, blockParams, depths),"inverse":container.program(25, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
},"main_d": function(fn, props, container, depth0, data, blockParams, depths) {
var decorators = container.decorators;
@@ -424,7 +437,7 @@ templates['model.html'] = template({"1":function(container,depth0,helpers,partia
+ container.escapeExpression(container.lambda(depth0, depth0))
+ "</a></li>\n";
},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
- var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+ var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
return "<tr>\n <td class=\"col-sm-2\">"
+ alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
@@ -437,7 +450,7 @@ templates['model.html'] = template({"1":function(container,depth0,helpers,partia
+ " </ul>\n </div>\n </div>\n </td>\n</tr>\n";
},"useData":true});
templates['terms.html'] = template({"1":function(container,depth0,helpers,partials,data) {
- var stack1, alias1=depth0 != null ? depth0 : {};
+ var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
return ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.program(9, data, 0),"data":data})) != null ? stack1 : "");
@@ -445,10 +458,10 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
var stack1;
return "<div>\n"
- + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "</div>\n";
},"3":function(container,depth0,helpers,partials,data) {
- var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+ var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
return " <span class=\"label label-default tag-"
+ alias4(((helper = (helper = helpers.category || (depth0 != null ? depth0.category : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"category","hash":{},"data":data}) : helper)))
@@ -461,12 +474,12 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
var stack1;
return "<ul>\n"
- + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "</ul>\n";
},"6":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, buffer =
" <li><span class=\"glossary-item\">";
- stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+ stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
if (stack1 != null) { buffer += stack1; }
return buffer + "</span></li>\n";
@@ -475,7 +488,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
},"9":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, buffer =
"<div class=\"glossary-item\">";
- stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+ stack1 = ((helper = (helper = helpers.multiLine || (depth0 != null ? depth0.multiLine : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"multiLine","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
if (!helpers.multiLine) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
if (stack1 != null) { buffer += stack1; }
return buffer + "</div>\n";
@@ -484,12 +497,12 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
return container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0));
},"12":function(container,depth0,helpers,partials,data) {
- var stack1, alias1=depth0 != null ? depth0 : {};
+ var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {});
- return "<div class=\"entry\" data-type=\"term\">\n <div class=\"actions\">\n <img src=\"/mixed/img/entry-current.png\" class=\"current\" title=\"Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)\" alt>\n"
+ return "<div class=\"entry\" data-type=\"term\">\n <div class=\"actions\">\n"
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"if","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.playback : depth0),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
- + " </div>\n\n"
+ + " <img src=\"/mixed/img/entry-current.png\" class=\"current\" title=\"Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)\" alt>\n </div>\n\n"
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reading : depth0),{"name":"if","hash":{},"fn":container.program(17, data, 0),"inverse":container.program(20, data, 0),"data":data})) != null ? stack1 : "")
+ "\n"
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reasons : depth0),{"name":"if","hash":{},"fn":container.program(22, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
@@ -499,11 +512,11 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.debug : depth0),{"name":"if","hash":{},"fn":container.program(34, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "</div>\n";
},"13":function(container,depth0,helpers,partials,data) {
- return " <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"term-kanji\"><img src=\"/mixed/img/add-term-kanji.png\" title=\"Add expression (Alt + E)\" alt></a>\n <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"term-kana\"><img src=\"/mixed/img/add-term-kana.png\" title=\"Add reading (Alt + R)\" alt></a>\n";
+ return " <a href=\"#\" class=\"action-view-note pending disabled\"><img src=\"/mixed/img/view-note.png\" title=\"View added note (Alt + V)\" alt></a>\n <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"term-kanji\"><img src=\"/mixed/img/add-term-kanji.png\" title=\"Add expression (Alt + E)\" alt></a>\n <a href=\"#\" class=\"action-add-note pending disabled\" data-mode=\"term-kana\"><img src=\"/mixed/img/add-term-kana.png\" title=\"Add reading (Alt + R)\" alt></a>\n";
},"15":function(container,depth0,helpers,partials,data) {
return " <a href=\"#\" class=\"action-play-audio\"><img src=\"/mixed/img/play-audio.png\" title=\"Play audio (Alt + P)\" alt></a>\n";
},"17":function(container,depth0,helpers,partials,data) {
- var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer =
+ var stack1, helper, options, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", buffer =
" <div class=\"expression\"><ruby>";
stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : alias2),(options={"name":"kanjiLinks","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data}),(typeof helper === alias3 ? helper.call(alias1,options) : helper));
if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
@@ -514,11 +527,11 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
},"18":function(container,depth0,helpers,partials,data) {
var helper;
- return container.escapeExpression(((helper = (helper = helpers.expression || (depth0 != null ? depth0.expression : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"expression","hash":{},"data":data}) : helper)));
+ return container.escapeExpression(((helper = (helper = helpers.expression || (depth0 != null ? depth0.expression : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"expression","hash":{},"data":data}) : helper)));
},"20":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, buffer =
" <div class=\"expression\">";
- stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"kanjiLinks","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+ stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"kanjiLinks","hash":{},"fn":container.program(18, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
if (stack1 != null) { buffer += stack1; }
return buffer + "</div>\n";
@@ -526,7 +539,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
var stack1;
return " <div class=\"reasons\">\n"
- + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.reasons : depth0),{"name":"each","hash":{},"fn":container.program(23, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.reasons : depth0),{"name":"each","hash":{},"fn":container.program(23, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ " </div>\n";
},"23":function(container,depth0,helpers,partials,data) {
var stack1;
@@ -534,19 +547,19 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
return " <span class=\"reasons\">"
+ container.escapeExpression(container.lambda(depth0, depth0))
+ "</span> "
- + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(24, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.last),{"name":"unless","hash":{},"fn":container.program(24, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "\n";
},"24":function(container,depth0,helpers,partials,data) {
return "&laquo;";
},"26":function(container,depth0,helpers,partials,data) {
var stack1;
- return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(27, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
+ return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(27, data, 0),"inverse":container.program(30, data, 0),"data":data})) != null ? stack1 : "");
},"27":function(container,depth0,helpers,partials,data) {
var stack1;
return " <ol>\n"
- + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(28, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ + ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(28, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ " </ol>\n";
},"28":function(container,depth0,helpers,partials,data) {
var stack1;
@@ -565,7 +578,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
},"34":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, buffer =
" <pre>";
- stack1 = ((helper = (helper = helpers.dumpObject || (depth0 != null ? depth0.dumpObject : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"dumpObject","hash":{},"fn":container.program(35, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper));
+ stack1 = ((helper = (helper = helpers.dumpObject || (depth0 != null ? depth0.dumpObject : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"dumpObject","hash":{},"fn":container.program(35, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),options) : helper));
if (!helpers.dumpObject) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)}
if (stack1 != null) { buffer += stack1; }
return buffer + "</pre>\n";
@@ -576,11 +589,11 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
},"37":function(container,depth0,helpers,partials,data,blockParams,depths) {
var stack1;
- return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(38, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+ return ((stack1 = helpers.each.call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(38, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
},"38":function(container,depth0,helpers,partials,data,blockParams,depths) {
var stack1;
- return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.first),{"name":"unless","hash":{},"fn":container.program(39, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.first),{"name":"unless","hash":{},"fn":container.program(39, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "\n"
+ ((stack1 = container.invokePartial(partials.term,depth0,{"name":"term","hash":{"playback":(depths[1] != null ? depths[1].playback : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1]),"grouped":(depths[1] != null ? depths[1].grouped : depths[1]),"debug":(depths[1] != null ? depths[1].debug : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
},"39":function(container,depth0,helpers,partials,data) {
@@ -591,7 +604,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
var stack1;
return "\n\n"
- + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(37, data, 0, blockParams, depths),"inverse":container.program(41, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
+ + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(37, data, 0, blockParams, depths),"inverse":container.program(41, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "");
},"main_d": function(fn, props, container, depth0, data, blockParams, depths) {
var decorators = container.decorators;
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 8d65a0cd..1be485c7 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -19,135 +19,106 @@
class Translator {
constructor() {
- this.loaded = false;
- this.ruleMeta = null;
- this.database = new Database();
- this.deinflector = new Deinflector();
+ this.database = null;
+ this.deinflector = null;
}
- prepare() {
- if (this.loaded) {
- return Promise.resolve();
+ async prepare() {
+ if (!this.database) {
+ this.database = new Database();
+ await this.database.prepare();
}
- const promises = [
- jsonLoadInt('/bg/lang/deinflect.json'),
- this.database.prepare()
- ];
-
- return Promise.all(promises).then(([reasons]) => {
- this.deinflector.setReasons(reasons);
- this.loaded = true;
- });
+ if (!this.deinflector) {
+ const url = chrome.extension.getURL('/bg/lang/deinflect.json');
+ const reasons = await requestJson(url, 'GET');
+ this.deinflector = new Deinflector(reasons);
+ }
}
- findTerms(text, dictionaries, alphanumeric) {
- const titles = Object.keys(dictionaries);
- const cache = {};
+ async findTermsGrouped(text, dictionaries, alphanumeric) {
+ const {length, definitions} = await this.findTerms(text, dictionaries, alphanumeric);
+ return {length, definitions: dictTermsGroup(definitions, dictionaries)};
+ }
+ async findTerms(text, dictionaries, alphanumeric) {
if (!alphanumeric && text.length > 0) {
const c = text[0];
if (!jpIsKana(c) && !jpIsKanji(c)) {
- return Promise.resolve({length: 0, definitions: []});
+ return {length: 0, definitions: []};
}
}
- return this.findTermsDeinflected(text, titles, cache).then(deinfLiteral => {
- const textHiragana = wanakana._katakanaToHiragana(text);
- if (text === textHiragana) {
- return deinfLiteral;
- } else {
- return this.findTermsDeinflected(textHiragana, titles, cache).then(deinfHiragana => deinfLiteral.concat(deinfHiragana));
- }
- }).then(deinflections => {
- let definitions = [];
- for (const deinflection of deinflections) {
- for (const definition of deinflection.definitions) {
- const tags = definition.tags.map(tag => dictTagBuild(tag, definition.tagMeta));
- tags.push(dictTagBuildSource(definition.dictionary));
- definitions.push({
- source: deinflection.source,
- reasons: deinflection.reasons,
- score: definition.score,
- id: definition.id,
- dictionary: definition.dictionary,
- expression: definition.expression,
- reading: definition.reading,
- glossary: definition.glossary,
- tags: dictTagsSort(tags)
- });
- }
- }
-
- definitions = dictTermsUndupe(definitions);
- definitions = dictTermsSort(definitions, dictionaries);
-
- let length = 0;
- for (const definition of definitions) {
- length = Math.max(length, definition.source.length);
- }
-
- return {length, definitions};
- });
- }
-
- findTermsGrouped(text, dictionaries, alphanumeric) {
- return this.findTerms(text, dictionaries, alphanumeric).then(({length, definitions}) => {
- return {length, definitions: dictTermsGroup(definitions, dictionaries)};
- });
- }
-
- findKanji(text, dictionaries) {
+ const cache = {};
const titles = Object.keys(dictionaries);
- const processed = {};
- const promises = [];
-
- for (const c of text) {
- if (!processed[c]) {
- promises.push(this.database.findKanji(c, titles));
- processed[c] = true;
- }
+ let deinflections = await this.findTermsDeinflected(text, titles, cache);
+ const textHiragana = jpKatakanaToHiragana(text);
+ if (text !== textHiragana) {
+ deinflections = deinflections.concat(await this.findTermsDeinflected(textHiragana, titles, cache));
}
- return Promise.all(promises).then(defSets => {
- const definitions = defSets.reduce((a, b) => a.concat(b), []);
- for (const definition of definitions) {
+ let definitions = [];
+ for (const deinflection of deinflections) {
+ for (const definition of deinflection.definitions) {
const tags = definition.tags.map(tag => dictTagBuild(tag, definition.tagMeta));
tags.push(dictTagBuildSource(definition.dictionary));
- definition.tags = dictTagsSort(tags);
+ definitions.push({
+ source: deinflection.source,
+ reasons: deinflection.reasons,
+ score: definition.score,
+ id: definition.id,
+ dictionary: definition.dictionary,
+ expression: definition.expression,
+ reading: definition.reading,
+ glossary: definition.glossary,
+ tags: dictTagsSort(tags)
+ });
}
+ }
+
+ definitions = dictTermsUndupe(definitions);
+ definitions = dictTermsSort(definitions, dictionaries);
- return definitions;
- });
+ let length = 0;
+ for (const definition of definitions) {
+ length = Math.max(length, definition.source.length);
+ }
+
+ return {length, definitions};
}
- findTermsDeinflected(text, dictionaries, cache) {
- const definer = term => {
+ async findTermsDeinflected(text, titles, cache) {
+ const definer = async term => {
if (cache.hasOwnProperty(term)) {
- return Promise.resolve(cache[term]);
+ return cache[term];
+ } else {
+ return cache[term] = await this.database.findTerms(term, titles);
}
-
- return this.database.findTerms(term, dictionaries).then(definitions => cache[term] = definitions);
};
- const promises = [];
+ let deinflections = [];
for (let i = text.length; i > 0; --i) {
- promises.push(this.deinflector.deinflect(text.slice(0, i), definer));
+ const textSlice = text.slice(0, i);
+ deinflections = deinflections.concat(await this.deinflector.deinflect(textSlice, definer));
}
- return Promise.all(promises).then(results => {
- let deinflections = [];
- for (const result of results) {
- deinflections = deinflections.concat(result);
- }
-
- return deinflections;
- });
+ return deinflections;
}
- processKanji(definitions) {
+ async findKanji(text, dictionaries) {
+ let definitions = [];
+ const processed = {};
+ const titles = Object.keys(dictionaries);
+ for (const c of text) {
+ if (!processed[c]) {
+ definitions = definitions.concat(await this.database.findKanji(c, titles));
+ processed[c] = true;
+ }
+ }
+
for (const definition of definitions) {
const tags = definition.tags.map(tag => dictTagBuild(tag, definition.tagMeta));
+ tags.push(dictTagBuildSource(definition.dictionary));
definition.tags = dictTagsSort(tags);
}
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index cdd5ec31..a92fd0bc 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
+ * Copyright (C) 2016-2017 Alex Yatskov <alex@foosoft.net>
* Author: Alex Yatskov <alex@foosoft.net>
*
* This program is free software: you can redistribute it and/or modify
@@ -16,542 +16,40 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
-/*
- * Promise
- */
-
-function promiseCallback(promise, callback) {
- return promise.then(result => {
- callback({result});
- }).catch(error => {
- callback({error});
- });
-}
-
-
-/*
- * Japanese
- */
-
-function jpIsKanji(c) {
- const code = c.charCodeAt(0);
- return code >= 0x4e00 && code < 0x9fb0 || code >= 0x3400 && code < 0x4dc0;
-}
-
-function jpIsKana(c) {
- return wanakana.isKana(c);
-}
-
-
-/*
- * Commands
- */
-
-function commandExec(command) {
- instYomi().onCommand(command);
-}
-
-
-/*
- * Instance
- */
-
-function instYomi() {
- return chrome.extension.getBackgroundPage().yomichan;
-}
-
-function instDb() {
- return instYomi().translator.database;
-}
-
-function instAnki() {
- return instYomi().anki;
-}
-
-
-/*
- * Foreground
- */
-
-function fgBroadcast(action, params) {
- chrome.tabs.query({}, tabs => {
- for (const tab of tabs) {
- chrome.tabs.sendMessage(tab.id, {action, params}, () => null);
- }
- });
-}
-
-function fgOptionsSet(options) {
- fgBroadcast('optionsSet', options);
-}
-
-
-/*
- * Options
- */
-
-function optionsSetDefaults(options) {
- const defaults = {
- general: {
- enable: true,
- audioSource: 'jpod101',
- audioVolume: 100,
- groupResults: true,
- debugInfo: false,
- maxResults: 32,
- showAdvanced: false,
- popupWidth: 400,
- popupHeight: 250,
- popupOffset: 10,
- showGuide: true
- },
-
- scanning: {
- middleMouse: true,
- selectText: true,
- alphanumeric: true,
- delay: 15,
- length: 10,
- modifier: 'shift'
- },
-
- dictionaries: {},
-
- anki: {
- enable: false,
- server: 'http://127.0.0.1:8765',
- tags: ['yomichan'],
- htmlCards: true,
- sentenceExt: 200,
- terms: {deck: '', model: '', fields: {}},
- kanji: {deck: '', model: '', fields: {}}
- }
- };
-
- const combine = (target, source) => {
- for (const key in source) {
- if (!target.hasOwnProperty(key)) {
- target[key] = source[key];
- }
- }
+function utilAsync(func) {
+ return function(...args) {
+ func.apply(this, args);
};
-
- combine(options, defaults);
- combine(options.general, defaults.general);
- combine(options.scanning, defaults.scanning);
- combine(options.anki, defaults.anki);
- combine(options.anki.terms, defaults.anki.terms);
- combine(options.anki.kanji, defaults.anki.kanji);
-
- return options;
-}
-
-function optionsVersion(options) {
- const fixups = [
- () => {},
- () => {},
- () => {},
- () => {},
- () => {
- if (options.general.audioPlayback) {
- options.general.audioSource = 'jpod101';
- } else {
- options.general.audioSource = 'disabled';
- }
- },
- () => {
- options.general.showGuide = false;
- },
- () => {
- if (options.scanning.requireShift) {
- options.scanning.modifier = 'shift';
- } else {
- options.scanning.modifier = 'none';
- }
- }
- ];
-
- optionsSetDefaults(options);
- if (!options.hasOwnProperty('version')) {
- options.version = fixups.length;
- }
-
- while (options.version < fixups.length) {
- fixups[options.version++]();
- }
-
- return options;
-}
-
-function optionsLoad() {
- return new Promise((resolve, reject) => {
- chrome.storage.local.get(null, store => resolve(store.options));
- }).then(optionsStr => {
- return optionsStr ? JSON.parse(optionsStr) : {};
- }).catch(error => {
- return {};
- }).then(options => {
- return optionsVersion(options);
- });
-}
-
-function optionsSave(options) {
- return new Promise((resolve, reject) => {
- chrome.storage.local.set({options: JSON.stringify(options)}, resolve);
- }).then(() => {
- instYomi().optionsSet(options);
- fgOptionsSet(options);
- });
-}
-
-
-/*
- * Dictionary
- */
-
-function dictEnabledSet(options) {
- const dictionaries = {};
- for (const title in options.dictionaries) {
- const dictionary = options.dictionaries[title];
- if (dictionary.enabled) {
- dictionaries[title] = dictionary;
- }
- }
-
- return dictionaries;
-}
-
-function dictConfigured(options) {
- for (const title in options.dictionaries) {
- if (options.dictionaries[title].enabled) {
- return true;
- }
- }
-
- return false;
-}
-
-function dictRowsSort(rows, options) {
- return rows.sort((ra, rb) => {
- const pa = (options.dictionaries[ra.title] || {}).priority || 0;
- const pb = (options.dictionaries[rb.title] || {}).priority || 0;
- if (pa > pb) {
- return -1;
- } else if (pa < pb) {
- return 1;
- } else {
- return 0;
- }
- });
-}
-
-function dictTermsSort(definitions, dictionaries=null) {
- return definitions.sort((v1, v2) => {
- const sl1 = v1.source.length;
- const sl2 = v2.source.length;
- if (sl1 > sl2) {
- return -1;
- } else if (sl1 < sl2) {
- return 1;
- }
-
- if (dictionaries !== null) {
- const p1 = (dictionaries[v1.dictionary] || {}).priority || 0;
- const p2 = (dictionaries[v2.dictionary] || {}).priority || 0;
- if (p1 > p2) {
- return -1;
- } else if (p1 < p2) {
- return 1;
- }
- }
-
- const s1 = v1.score;
- const s2 = v2.score;
- if (s1 > s2) {
- return -1;
- } else if (s1 < s2) {
- return 1;
- }
-
- const rl1 = v1.reasons.length;
- const rl2 = v2.reasons.length;
- if (rl1 < rl2) {
- return -1;
- } else if (rl1 > rl2) {
- return 1;
- }
-
- return v2.expression.localeCompare(v1.expression);
- });
-}
-
-function dictTermsUndupe(definitions) {
- const definitionGroups = {};
- for (const definition of definitions) {
- const definitionExisting = definitionGroups[definition.id];
- if (!definitionGroups.hasOwnProperty(definition.id) || definition.expression.length > definitionExisting.expression.length) {
- definitionGroups[definition.id] = definition;
- }
- }
-
- const definitionsUnique = [];
- for (const key in definitionGroups) {
- definitionsUnique.push(definitionGroups[key]);
- }
-
- return definitionsUnique;
-}
-
-function dictTermsGroup(definitions, dictionaries) {
- const groups = {};
- for (const definition of definitions) {
- const key = [definition.source, definition.expression].concat(definition.reasons);
- if (definition.reading) {
- key.push(definition.reading);
- }
-
- const group = groups[key];
- if (group) {
- group.push(definition);
- } else {
- groups[key] = [definition];
- }
- }
-
- const results = [];
- for (const key in groups) {
- const groupDefs = groups[key];
- const firstDef = groupDefs[0];
- dictTermsSort(groupDefs, dictionaries);
- results.push({
- definitions: groupDefs,
- expression: firstDef.expression,
- reading: firstDef.reading,
- reasons: firstDef.reasons,
- score: groupDefs.reduce((p, v) => v.score > p ? v.score : p, Number.MIN_SAFE_INTEGER),
- source: firstDef.source
- });
- }
-
- return dictTermsSort(results);
-}
-
-function dictTagBuildSource(name) {
- return dictTagSanitize({name, category: 'dictionary', order: 100});
-}
-
-function dictTagBuild(name, meta) {
- const tag = {name};
- const symbol = name.split(':')[0];
- for (const prop in meta[symbol] || {}) {
- tag[prop] = meta[symbol][prop];
- }
-
- return dictTagSanitize(tag);
-}
-
-function dictTagSanitize(tag) {
- tag.name = tag.name || 'untitled';
- tag.category = tag.category || 'default';
- tag.notes = tag.notes || '';
- tag.order = tag.order || 0;
- return tag;
-}
-
-function dictTagsSort(tags) {
- return tags.sort((v1, v2) => {
- const order1 = v1.order;
- const order2 = v2.order;
- if (order1 < order2) {
- return -1;
- } else if (order1 > order2) {
- return 1;
- }
-
- const name1 = v1.name;
- const name2 = v2.name;
- if (name1 < name2) {
- return -1;
- } else if (name1 > name2) {
- return 1;
- }
-
- return 0;
- });
}
-function dictFieldSplit(field) {
- return field.length === 0 ? [] : field.split(' ');
+function utilIsolate(data) {
+ return JSON.parse(JSON.stringify(data));
}
-function dictFieldFormat(field, definition, mode, options) {
- const markers = [
- 'audio',
- 'character',
- 'cloze-body',
- 'cloze-prefix',
- 'cloze-suffix',
- 'dictionary',
- 'expression',
- 'furigana',
- 'glossary',
- 'kunyomi',
- 'onyomi',
- 'reading',
- 'sentence',
- 'tags',
- 'url'
- ];
-
- for (const marker of markers) {
- const data = {
- marker,
- definition,
- group: options.general.groupResults,
- html: options.anki.htmlCards,
- modeTermKanji: mode === 'term-kanji',
- modeTermKana: mode === 'term-kana',
- modeKanji: mode === 'kanji'
- };
-
- field = field.replace(
- `{${marker}}`,
- Handlebars.templates['fields.html'](data).trim()
- );
- }
-
- return field;
+function utilBackend() {
+ return chrome.extension.getBackgroundPage().yomichan_backend;
}
-
-/*
- * Json
- */
-
-function jsonLoad(url) {
- return new Promise((resolve, reject) => {
- const xhr = new XMLHttpRequest();
- xhr.overrideMimeType('application/json');
- xhr.addEventListener('load', () => resolve(xhr.responseText));
- xhr.addEventListener('error', () => reject('failed to execute network request'));
- xhr.open('GET', url);
- xhr.send();
- }).then(responseText => {
- try {
- return JSON.parse(responseText);
- }
- catch (e) {
- return Promise.reject('invalid JSON response');
- }
- });
+function utilAnkiGetModelNames() {
+ return utilBackend().anki.getModelNames();
}
-function jsonLoadInt(url) {
- return jsonLoad(chrome.extension.getURL(url));
+function utilAnkiGetDeckNames() {
+ return utilBackend().anki.getDeckNames();
}
-/*
- * Zip
- */
-
-function zipLoadDb(archive, indexLoaded, termsLoaded, kanjiLoaded) {
- return JSZip.loadAsync(archive).then(files => files.files).then(files => {
- const indexFile = files['index.json'];
- if (!indexFile) {
- return Promise.reject('no dictionary index found in archive');
- }
-
- return indexFile.async('string').then(indexJson => {
- const index = JSON.parse(indexJson);
- if (!index.title || !index.version || !index.revision) {
- return Promise.reject('unrecognized dictionary format');
- }
-
- return indexLoaded(
- index.title,
- index.version,
- index.revision,
- index.tagMeta || {},
- index.termBanks > 0,
- index.kanjiBanks > 0
- ).then(() => index);
- }).then(index => {
- const loaders = [];
- const banksTotal = index.termBanks + index.kanjiBanks;
- let banksLoaded = 0;
-
- for (let i = 1; i <= index.termBanks; ++i) {
- const bankFile = files[`term_bank_${i}.json`];
- if (!bankFile) {
- return Promise.reject('missing term bank file');
- }
-
- loaders.push(() => bankFile.async('string').then(bankJson => {
- const bank = JSON.parse(bankJson);
- return termsLoaded(index.title, bank, banksTotal, banksLoaded++);
- }));
- }
-
- for (let i = 1; i <= index.kanjiBanks; ++i) {
- const bankFile = files[`kanji_bank_${i}.json`];
- if (!bankFile) {
- return Promise.reject('missing kanji bank file');
- }
-
- loaders.push(() => bankFile.async('string').then(bankJson => {
- const bank = JSON.parse(bankJson);
- return kanjiLoaded(index.title, bank, banksTotal, banksLoaded++);
- }));
- }
-
- let chain = Promise.resolve();
- for (const loader of loaders) {
- chain = chain.then(loader);
- }
-
- return chain;
- });
- });
-}
-
-/*
- * Helpers
- */
-
-function handlebarsEscape(text) {
- return Handlebars.Utils.escapeExpression(text);
-}
-
-function handlebarsDumpObject(options) {
- const dump = JSON.stringify(options.fn(this), null, 4);
- return handlebarsEscape(dump);
-}
-
-function handlebarsKanjiLinks(options) {
- let result = '';
- for (const c of options.fn(this)) {
- if (jpIsKanji(c)) {
- result += `<a href="#" class="kanji-link">${c}</a>`;
- } else {
- result += c;
- }
- }
-
- return result;
+function utilAnkiGetModelFieldNames(modelName) {
+ return utilBackend().anki.getModelFieldNames(modelName);
}
-function handlebarsMultiLine(options) {
- return options.fn(this).split('\n').join('<br>');
+function utilDatabaseGetDictionaries() {
+ return utilBackend().translator.database.getDictionaries();
}
-function handlebarsRegister() {
- Handlebars.partials = Handlebars.templates;
- Handlebars.registerHelper('dumpObject', handlebarsDumpObject);
- Handlebars.registerHelper('kanjiLinks', handlebarsKanjiLinks);
- Handlebars.registerHelper('multiLine', handlebarsMultiLine);
+function utilDatabasePurge() {
+ return utilBackend().translator.database.purge();
}
-function handlebarsRender(template, data) {
- return Handlebars.templates[template](data);
+function utilDatabaseImport(data, progress) {
+ return utilBackend().translator.database.importDictionary(data, progress);
}
diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js
deleted file mode 100644
index b4beb179..00000000
--- a/ext/bg/js/yomichan.js
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-window.yomichan = new class {
- constructor() {
- handlebarsRegister();
-
- this.translator = new Translator();
- this.anki = new AnkiNull();
- this.options = null;
-
- this.translator.prepare().then(optionsLoad).then(this.optionsSet.bind(this)).then(() => {
- chrome.commands.onCommand.addListener(this.onCommand.bind(this));
- chrome.runtime.onMessage.addListener(this.onMessage.bind(this));
- if (this.options.general.showGuide) {
- chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
- }
- });
- }
-
- optionsSet(options) {
- // In Firefox, setting options from the options UI somehow carries references
- // to the DOM across to the background page, causing the options object to
- // become a "DeadObject" after the options page is closed. The workaround used
- // here is to create a deep copy of the options object.
- this.options = JSON.parse(JSON.stringify(options));
-
- if (!this.options.general.enable) {
- chrome.browserAction.setBadgeBackgroundColor({color: '#d9534f'});
- chrome.browserAction.setBadgeText({text: 'off'});
- } else if (!dictConfigured(this.options)) {
- chrome.browserAction.setBadgeBackgroundColor({color: '#f0ad4e'});
- chrome.browserAction.setBadgeText({text: '!'});
- } else {
- chrome.browserAction.setBadgeText({text: ''});
- }
-
- if (this.options.anki.enable) {
- this.anki = new AnkiConnect(this.options.anki.server);
- } else {
- this.anki = new AnkiNull();
- }
- }
-
- noteFormat(definition, mode) {
- const note = {
- fields: {},
- tags: this.options.anki.tags
- };
-
- let fields = [];
- if (mode === 'kanji') {
- fields = this.options.anki.kanji.fields;
- note.deckName = this.options.anki.kanji.deck;
- note.modelName = this.options.anki.kanji.model;
- } else {
- fields = this.options.anki.terms.fields;
- note.deckName = this.options.anki.terms.deck;
- note.modelName = this.options.anki.terms.model;
-
- if (definition.audio) {
- const audio = {
- url: definition.audio.url,
- filename: definition.audio.filename,
- skipHash: '7e2c2f954ef6051373ba916f000168dc',
- fields: []
- };
-
- for (const name in fields) {
- if (fields[name].includes('{audio}')) {
- audio.fields.push(name);
- }
- }
-
- if (audio.fields.length > 0) {
- note.audio = audio;
- }
- }
- }
-
- for (const name in fields) {
- note.fields[name] = dictFieldFormat(
- fields[name],
- definition,
- mode,
- this.options
- );
- }
-
- return note;
- }
-
- termsFind(text) {
- const searcher = this.options.general.groupResults ?
- this.translator.findTermsGrouped.bind(this.translator) :
- this.translator.findTerms.bind(this.translator);
-
- return searcher(text, dictEnabledSet(this.options), this.options.scanning.alphanumeric).then(({definitions, length}) => {
- return {length, definitions: definitions.slice(0, this.options.general.maxResults)};
- });
- }
-
- kanjiFind(text) {
- return this.translator.findKanji(text, dictEnabledSet(this.options)).then(definitions => {
- return definitions.slice(0, this.options.general.maxResults);
- });
- }
-
- definitionAdd(definition, mode) {
- let promise = Promise.resolve();
- if (mode !== 'kanji') {
- promise = audioInject(definition, this.options.anki.terms.fields, this.options.general.audioSource);
- }
-
- return promise.then(() => {
- const note = this.noteFormat(definition, mode);
- return this.anki.addNote(note);
- });
- }
-
- definitionsAddable(definitions, modes) {
- const notes = [];
- for (const definition of definitions) {
- for (const mode of modes) {
- notes.push(this.noteFormat(definition, mode));
- }
- }
-
- return this.anki.canAddNotes(notes).then(raw => {
- const states = [];
- for (let resultBase = 0; resultBase < raw.length; resultBase += modes.length) {
- const state = {};
- for (let modeOffset = 0; modeOffset < modes.length; ++modeOffset) {
- state[modes[modeOffset]] = raw[resultBase + modeOffset];
- }
-
- states.push(state);
- }
-
- return states;
- });
- }
-
- templateRender(template, data) {
- return Promise.resolve(handlebarsRender(template, data));
- }
-
- onCommand(command) {
- const handlers = {
- search: () => {
- chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
- },
-
- help: () => {
- chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
- },
-
- options: () => {
- chrome.runtime.openOptionsPage();
- },
-
- toggle: () => {
- this.options.general.enable = !this.options.general.enable;
- optionsSave(this.options).then(() => this.optionsSet(this.options));
- }
- };
-
- const handler = handlers[command];
- if (handler) {
- handler();
- }
- }
-
- onMessage({action, params}, sender, callback) {
- const handlers = {
- optionsGet: ({callback}) => {
- promiseCallback(optionsLoad(), callback);
- },
-
- kanjiFind: ({text, callback}) => {
- promiseCallback(this.kanjiFind(text), callback);
- },
-
- termsFind: ({text, callback}) => {
- promiseCallback(this.termsFind(text), callback);
- },
-
- templateRender: ({template, data, callback}) => {
- promiseCallback(this.templateRender(template, data), callback);
- },
-
- definitionAdd: ({definition, mode, callback}) => {
- promiseCallback(this.definitionAdd(definition, mode), callback);
- },
-
- definitionsAddable: ({definitions, modes, callback}) => {
- promiseCallback(this.definitionsAddable(definitions, modes), callback);
- }
- };
-
- const handler = handlers[action];
- if (handler) {
- params.callback = callback;
- handler(params);
- }
-
- return true;
- }
-};