Yomichan Dictionary Import

@@ -73,7 +60,6 @@

@@ -81,6 +67,11 @@

+ +

+ Scan length +

diff --git a/ext/fg/js/frame.js b/ext/fg/js/frame.js index 30cb7c73..d06e8b94 100644 --- a/ext/fg/js/frame.js +++ b/ext/fg/js/frame.js @@ -46,19 +46,6 @@ function registerAudioLinks() { } } -function onDomContentLoaded() { - registerKanjiLinks(); - registerAddNoteLinks(); - registerAudioLinks(); -} - -function onMessage(e) { - const {action, params} = e.data, method = window['api_' + action]; - if (typeof(method) === 'function') { - method(params); - } -} - function api_setActionState({index, state, sequence}) { for (const mode in state) { const matches = document.querySelectorAll(`.action-bar[data-sequence="${sequence}"] .action-add-note[data-index="${index}"][data-mode="${mode}"]`); @@ -75,5 +62,15 @@ function api_setActionState({index, state, sequence}) { } } -document.addEventListener('DOMContentLoaded', onDomContentLoaded, false); -window.addEventListener('message', onMessage); +document.addEventListener('DOMContentLoaded', () => { + registerKanjiLinks(); + registerAddNoteLinks(); + registerAudioLinks(); +}); + +window.addEventListener('message', () => { + const {action, params} = e.data, method = window['api_' + action]; + if (typeof(method) === 'function') { + method(params); + } +}); -- cgit v1.2.3 From c3ead3af939c7e235b891244a09a25c180c34a8f Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Wed, 14 Sep 2016 22:40:35 -0700 Subject: . --- ext/bg/js/options-form.js | 2 +- ext/bg/js/options.js | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'ext') diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js index f7d4279f..81bf39a5 100644 --- a/ext/bg/js/options-form.js +++ b/ext/bg/js/options-form.js @@ -32,7 +32,7 @@ function fieldsToDict(selection) { function modelIdToFieldOptKey(id) { return { - 'anki-term-model': 'ankiTermFields', + 'anki-term-model': 'ankiTermFields', 'anki-kanji-model': 'ankiKanjiFields' }[id]; } diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index 6b305f2f..857f59f2 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -19,20 +19,20 @@ function sanitizeOptions(options) { const defaults = { - scanLength: 20, - activateOnStartup: false, - selectMatchedText: true, + scanLength: 20, + activateOnStartup: false, + selectMatchedText: true, showAdvancedOptions: false, enableAudioPlayback: true, - enableAnkiConnect: false, - ankiCardTags: ['yomichan'], - sentenceExtent: 200, - ankiTermDeck: '', - ankiTermModel: '', - ankiTermFields: {}, - ankiKanjiDeck: '', - ankiKanjiModel: '', - ankiKanjiFields: {} + enableAnkiConnect: false, + ankiCardTags: ['yomichan'], + sentenceExtent: 200, + ankiTermDeck: '', + ankiTermModel: '', + ankiTermFields: {}, + ankiKanjiDeck: '', + ankiKanjiModel: '', + ankiKanjiFields: {} }; for (const key in defaults) { -- cgit v1.2.3 From 3608c9c16e7154802bacbf38356fd4f36824e267 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Wed, 14 Sep 2016 22:54:07 -0700 Subject: . --- ext/bg/js/options-form.js | 4 ++-- ext/bg/js/options.js | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'ext') diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js index 81bf39a5..1cd050b4 100644 --- a/ext/bg/js/options-form.js +++ b/ext/bg/js/options-form.js @@ -229,12 +229,12 @@ function onAnkiModelChanged(e) { $(document).ready(() => { loadOptions().then(opts => { - $('#scan-length').val(opts.scanLength); $('#activate-on-startup').prop('checked', opts.activateOnStartup); $('#select-matched-text').prop('checked', opts.selectMatchedText); - $('#show-advanced-options').prop('checked', opts.showAdvancedOptions); $('#enable-audio-playback').prop('checked', opts.enableAudioPlayback); $('#enable-anki-connect').prop('checked', opts.enableAnkiConnect); + $('#show-advanced-options').prop('checked', opts.showAdvancedOptions); + $('#scan-length').val(opts.scanLength); $('#anki-card-tags').val(opts.ankiCardTags.join(' ')); $('#sentence-extent').val(opts.sentenceExtent); diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index 857f59f2..290b5b05 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -19,14 +19,16 @@ function sanitizeOptions(options) { const defaults = { - scanLength: 20, activateOnStartup: false, selectMatchedText: true, - showAdvancedOptions: false, enableAudioPlayback: true, enableAnkiConnect: false, + showAdvancedOptions: false, + scanLength: 20, + ankiCardTags: ['yomichan'], sentenceExtent: 200, + ankiTermDeck: '', ankiTermModel: '', ankiTermFields: {}, -- cgit v1.2.3 From 7069f428eee7134416bb72ea4f7a7ec3e214a465 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Thu, 15 Sep 2016 20:10:11 -0700 Subject: Cleanup --- ext/bg/import.html | 2 +- ext/bg/js/import.js | 13 +++++++++++-- ext/bg/js/options.js | 10 ++++++++-- ext/bg/js/yomichan.js | 2 +- 4 files changed, 21 insertions(+), 6 deletions(-) (limited to 'ext') diff --git a/ext/bg/import.html b/ext/bg/import.html index 47483c25..85841eee 100644 --- a/ext/bg/import.html +++ b/ext/bg/import.html @@ -15,7 +15,7 @@

Importing dictionary data, this can take a while...

diff --git a/ext/bg/js/import.js b/ext/bg/js/import.js index 905b4580..ebc7c7be 100644 --- a/ext/bg/js/import.js +++ b/ext/bg/js/import.js @@ -17,7 +17,16 @@ */ -chrome.runtime.onMessage.addListener(({state, progress}, sender, callback) => { - $('.progress-bar').css('width', progress + '%'); +function api_setProgress({state, progress}) { + const str = `${progress}%`; + $('.progress-bar').css('width', str).text(str); +} + +chrome.runtime.onMessage.addListener(({action, params}, sender, callback) => { + const method = this['api_' + action]; + if (typeof(method) === 'function') { + method.call(this, params); + } + callback(); }); diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index 290b5b05..83eb1f0a 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -47,9 +47,15 @@ function sanitizeOptions(options) { } function loadOptions() { - return new Promise((resolve, reject) => chrome.storage.sync.get(null, resolve)); + return new Promise((resolve, reject) => { + chrome.storage.sync.get(null, opts => { + resolve(sanitizeOptions(opts)); + }); + }); } function saveOptions(opts) { - return new Promise((resolve, reject) => chrome.storage.sync.set(sanitizeOptions(opts), resolve)); + return new Promise((resolve, reject) => { + chrome.storage.sync.set(sanitizeOptions(opts), resolve); + }); } diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js index bec34691..24ddf92d 100644 --- a/ext/bg/js/yomichan.js +++ b/ext/bg/js/yomichan.js @@ -54,7 +54,7 @@ class Yomichan { } if (this.importTabId !== null) { - chrome.tabs.sendMessage(this.importTabId, {state, progress}, () => null); + this.tabInvoke(this.importTabId, 'setProgress', {state, progress}); } if (state === 'end') { -- cgit v1.2.3 From b87611cfddf5ca0e1529b88ed1610ebe0d4657e6 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Thu, 15 Sep 2016 20:16:23 -0700 Subject: Bugfixes --- ext/fg/js/frame.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext') diff --git a/ext/fg/js/frame.js b/ext/fg/js/frame.js index d06e8b94..590646d5 100644 --- a/ext/fg/js/frame.js +++ b/ext/fg/js/frame.js @@ -68,7 +68,7 @@ document.addEventListener('DOMContentLoaded', () => { registerAudioLinks(); }); -window.addEventListener('message', () => { +window.addEventListener('message', e => { const {action, params} = e.data, method = window['api_' + action]; if (typeof(method) === 'function') { method(params); -- cgit v1.2.3 From b969e8952c551fdc7c150dcc111eccdc90ac7408 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Thu, 15 Sep 2016 21:03:58 -0700 Subject: Cleanup --- ext/bg/js/translator.js | 6 +++--- ext/fg/js/client.js | 6 +++--- ext/fg/js/frame.js | 10 +++++++--- ext/fg/js/popup.js | 2 +- ext/fg/js/util.js | 12 ++++++------ 5 files changed, 20 insertions(+), 16 deletions(-) (limited to 'ext') diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js index 2331bde7..e534e0cb 100644 --- a/ext/bg/js/translator.js +++ b/ext/bg/js/translator.js @@ -54,10 +54,10 @@ class Translator { percent += banks[url].loaded / banks[url].total; } - percent /= 3; + percent /= 3.0; if (callback) { - callback({state: 'update', progress: Math.ceil(100 * percent)}); + callback({state: 'update', progress: Math.ceil(100.0 * percent)}); } }; @@ -69,7 +69,7 @@ class Translator { return this.dictionary.sealDb(); }).then(() => { if (callback) { - callback({state: 'end', progress: 100}); + callback({state: 'end', progress: 100.0}); } }); }).then(() => { diff --git a/ext/fg/js/client.js b/ext/fg/js/client.js index daeabf99..717b5873 100644 --- a/ext/fg/js/client.js +++ b/ext/fg/js/client.js @@ -116,7 +116,7 @@ class Client { return canAddDefinitions(definitions, ['term_kanji', 'term_kana']); }).then(states => { if (states !== null) { - states.forEach((state, index) => this.popup.sendMessage('setActionState', {index, state, sequence })); + states.forEach((state, index) => this.popup.invokeApi('setActionState', {index, state, sequence})); } }); } @@ -158,7 +158,7 @@ class Client { const state = {[mode]: false}; addDefinition(this.definitions[index], mode).then(success => { if (success) { - this.popup.sendMessage('setActionState', {index, state, sequence: this.sequence}); + this.popup.invokeApi('setActionState', {index, state, sequence: this.sequence}); } else { alert('Note could not be added'); } @@ -195,7 +195,7 @@ class Client { return canAddDefinitions(definitions, ['kanji']); }).then(states => { if (states !== null) { - states.forEach((state, index) => this.popup.sendMessage('setActionState', {index, state, sequence})); + states.forEach((state, index) => this.popup.invokeApi('setActionState', {index, state, sequence})); } }); }); diff --git a/ext/fg/js/frame.js b/ext/fg/js/frame.js index 590646d5..8a99a405 100644 --- a/ext/fg/js/frame.js +++ b/ext/fg/js/frame.js @@ -17,11 +17,15 @@ */ +function invokeApi(action, params, target) { + target.postMessage({action, params}, '*'); +} + function registerKanjiLinks() { for (const link of Array.from(document.getElementsByClassName('kanji-link'))) { link.addEventListener('click', e => { e.preventDefault(); - window.parent.postMessage({action: 'displayKanji', params: e.target.innerHTML}, '*'); + invokeApi('displayKanji', e.target.innerHTML, window.parent); }); } } @@ -31,7 +35,7 @@ function registerAddNoteLinks() { link.addEventListener('click', e => { e.preventDefault(); const ds = e.currentTarget.dataset; - window.parent.postMessage({action: 'addNote', params: {index: ds.index, mode: ds.mode}}, '*'); + invokeApi('addNote', {index: ds.index, mode: ds.mode}, window.parent); }); } } @@ -41,7 +45,7 @@ function registerAudioLinks() { link.addEventListener('click', e => { e.preventDefault(); const ds = e.currentTarget.dataset; - window.parent.postMessage({action: 'playAudio', params: ds.index}, '*'); + invokeApi('playAudio', ds.index, window.parent); }); } } diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js index 930df18d..88b8e4e3 100644 --- a/ext/fg/js/popup.js +++ b/ext/fg/js/popup.js @@ -68,7 +68,7 @@ class Popup { doc.close(); } - sendMessage(action, params, callback) { + invokeApi(action, params) { if (this.popup !== null) { this.popup.contentWindow.postMessage({action, params}, '*'); } diff --git a/ext/fg/js/util.js b/ext/fg/js/util.js index 176765fc..c24ad885 100644 --- a/ext/fg/js/util.js +++ b/ext/fg/js/util.js @@ -17,28 +17,28 @@ */ -function sendMessage(action, params) { +function invokeApiBg(action, params) { return new Promise((resolve, reject) => chrome.runtime.sendMessage({action, params}, resolve)); } function findTerm(text) { - return sendMessage('findTerm', {text}); + return invokeApiBg('findTerm', {text}); } function findKanji(text) { - return sendMessage('findKanji', {text}); + return invokeApiBg('findKanji', {text}); } function renderText(data, template) { - return sendMessage('renderText', {data, template}); + return invokeApiBg('renderText', {data, template}); } function canAddDefinitions(definitions, modes) { - return sendMessage('canAddDefinitions', {definitions, modes}); + return invokeApiBg('canAddDefinitions', {definitions, modes}); } function addDefinition(definition, mode) { - return sendMessage('addDefinition', {definition, mode}); + return invokeApiBg('addDefinition', {definition, mode}); } function textSourceFromPoint(point) { -- cgit v1.2.3 From dc273c0c73dd39e8cad45e591b02231cb2cbed8c Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Thu, 15 Sep 2016 22:44:33 -0700 Subject: Cleanup --- ext/fg/js/client.js | 205 ---------------------------------------------------- ext/fg/js/driver.js | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++++ ext/manifest.json | 2 +- 3 files changed, 206 insertions(+), 206 deletions(-) delete mode 100644 ext/fg/js/client.js create mode 100644 ext/fg/js/driver.js (limited to 'ext') diff --git a/ext/fg/js/client.js b/ext/fg/js/client.js deleted file mode 100644 index 717b5873..00000000 --- a/ext/fg/js/client.js +++ /dev/null @@ -1,205 +0,0 @@ -/* - * Copyright (C) 2016 Alex Yatskov - * Author: Alex Yatskov - * - * 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 . - */ - - -class Client { - constructor() { - this.popup = new Popup(); - this.audio = {}; - this.lastMousePos = null; - this.lastTextSource = null; - this.pendingLookup = false; - this.enabled = false; - this.options = {}; - this.definitions = null; - this.sequence = 0; - this.fgRoot = chrome.extension.getURL('fg'); - - chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this)); - window.addEventListener('message', this.onFrameMessage.bind(this)); - window.addEventListener('mousedown', this.onMouseDown.bind(this)); - window.addEventListener('mousemove', this.onMouseMove.bind(this)); - window.addEventListener('keydown', this.onKeyDown.bind(this)); - window.addEventListener('scroll', e => this.hidePopup()); - window.addEventListener('resize', e => this.hidePopup()); - } - - onKeyDown(e) { - if (this.enabled && this.lastMousePos !== null && (e.keyCode === 16 || e.charCode === 16)) { - this.searchAt(this.lastMousePos); - } - } - - onMouseMove(e) { - this.lastMousePos = {x: e.clientX, y: e.clientY}; - if (this.enabled && (e.shiftKey || e.which === 2)) { - this.searchAt(this.lastMousePos); - } - } - - onMouseDown(e) { - this.lastMousePos = {x: e.clientX, y: e.clientY}; - if (this.enabled && (e.shiftKey || e.which === 2)) { - this.searchAt(this.lastMousePos); - } else { - this.hidePopup(); - } - } - - onBgMessage({action, params}, sender, callback) { - const method = this['api_' + action]; - if (typeof(method) === 'function') { - method.call(this, params); - } - - callback(); - } - - onFrameMessage(e) { - const {action, params} = e.data, method = this['api_' + action]; - if (typeof(method) === 'function') { - method.call(this, params); - } - } - - searchAt(point) { - if (this.pendingLookup) { - return; - } - - const textSource = textSourceFromPoint(point); - if (textSource === null || !textSource.containsPoint(point)) { - this.hidePopup(); - return; - } - - if (this.lastTextSource !== null && this.lastTextSource.equals(textSource)) { - return; - } - - textSource.setEndOffset(this.options.scanLength); - - this.pendingLookup = true; - findTerm(textSource.text()).then(({definitions, length}) => { - if (length === 0) { - this.pendingLookup = false; - this.hidePopup(); - } else { - textSource.setEndOffset(length); - - const sentence = extractSentence(textSource, this.options.sentenceExtent); - definitions.forEach(definition => { - definition.url = window.location.href; - definition.sentence = sentence; - }); - - const sequence = ++this.sequence; - return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'term-list.html').then(content => { - this.definitions = definitions; - this.pendingLookup = false; - this.showPopup(textSource, content); - return canAddDefinitions(definitions, ['term_kanji', 'term_kana']); - }).then(states => { - if (states !== null) { - states.forEach((state, index) => this.popup.invokeApi('setActionState', {index, state, sequence})); - } - }); - } - }); - } - - showPopup(textSource, content) { - this.popup.showNextTo(textSource.getRect(), content); - - if (this.options.selectMatchedText) { - textSource.select(); - } - - this.lastTextSource = textSource; - } - - hidePopup() { - this.popup.hide(); - - if (this.options.selectMatchedText && this.lastTextSource !== null) { - this.lastTextSource.deselect(); - } - - this.lastTextSource = null; - this.definitions = null; - } - - api_setOptions(opts) { - this.options = opts; - } - - api_setEnabled(enabled) { - if (!(this.enabled = enabled)) { - this.hidePopup(); - } - } - - api_addNote({index, mode}) { - const state = {[mode]: false}; - addDefinition(this.definitions[index], mode).then(success => { - if (success) { - this.popup.invokeApi('setActionState', {index, state, sequence: this.sequence}); - } else { - alert('Note could not be added'); - } - }); - } - - api_playAudio(index) { - const definition = this.definitions[index]; - - let url = `https://assets.languagepod101.com/dictionary/japanese/audiomp3.php?kanji=${encodeURIComponent(definition.expression)}`; - if (definition.reading) { - url += `&kana=${encodeURIComponent(definition.reading)}`; - } - - for (const key in this.audio) { - this.audio[key].pause(); - } - - const audio = this.audio[url] || new Audio(url); - audio.currentTime = 0; - audio.play(); - - this.audio[url] = audio; - } - - api_displayKanji(kanji) { - findKanji(kanji).then(definitions => { - definitions.forEach(definition => definition.url = window.location.href); - - const sequence = ++this.sequence; - return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'kanji-list.html').then(content => { - this.definitions = definitions; - this.popup.setContent(content, definitions); - return canAddDefinitions(definitions, ['kanji']); - }).then(states => { - if (states !== null) { - states.forEach((state, index) => this.popup.invokeApi('setActionState', {index, state, sequence})); - } - }); - }); - } -} - -window.yomiClient = new Client(); diff --git a/ext/fg/js/driver.js b/ext/fg/js/driver.js new file mode 100644 index 00000000..de097980 --- /dev/null +++ b/ext/fg/js/driver.js @@ -0,0 +1,205 @@ +/* + * Copyright (C) 2016 Alex Yatskov + * Author: Alex Yatskov + * + * 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 . + */ + + +class Driver { + constructor() { + this.popup = new Popup(); + this.audio = {}; + this.lastMousePos = null; + this.lastTextSource = null; + this.pendingLookup = false; + this.enabled = false; + this.options = {}; + this.definitions = null; + this.sequence = 0; + this.fgRoot = chrome.extension.getURL('fg'); + + chrome.runtime.onMessage.addListener(this.onBgMessage.bind(this)); + window.addEventListener('message', this.onFrameMessage.bind(this)); + window.addEventListener('mousedown', this.onMouseDown.bind(this)); + window.addEventListener('mousemove', this.onMouseMove.bind(this)); + window.addEventListener('keydown', this.onKeyDown.bind(this)); + window.addEventListener('scroll', e => this.hidePopup()); + window.addEventListener('resize', e => this.hidePopup()); + } + + onKeyDown(e) { + if (this.enabled && this.lastMousePos !== null && (e.keyCode === 16 || e.charCode === 16)) { + this.searchAt(this.lastMousePos); + } + } + + onMouseMove(e) { + this.lastMousePos = {x: e.clientX, y: e.clientY}; + if (this.enabled && (e.shiftKey || e.which === 2)) { + this.searchAt(this.lastMousePos); + } + } + + onMouseDown(e) { + this.lastMousePos = {x: e.clientX, y: e.clientY}; + if (this.enabled && (e.shiftKey || e.which === 2)) { + this.searchAt(this.lastMousePos); + } else { + this.hidePopup(); + } + } + + onBgMessage({action, params}, sender, callback) { + const method = this['api_' + action]; + if (typeof(method) === 'function') { + method.call(this, params); + } + + callback(); + } + + onFrameMessage(e) { + const {action, params} = e.data, method = this['api_' + action]; + if (typeof(method) === 'function') { + method.call(this, params); + } + } + + searchAt(point) { + if (this.pendingLookup) { + return; + } + + const textSource = textSourceFromPoint(point); + if (textSource === null || !textSource.containsPoint(point)) { + this.hidePopup(); + return; + } + + if (this.lastTextSource !== null && this.lastTextSource.equals(textSource)) { + return; + } + + textSource.setEndOffset(this.options.scanLength); + + this.pendingLookup = true; + findTerm(textSource.text()).then(({definitions, length}) => { + if (length === 0) { + this.pendingLookup = false; + this.hidePopup(); + } else { + textSource.setEndOffset(length); + + const sentence = extractSentence(textSource, this.options.sentenceExtent); + definitions.forEach(definition => { + definition.url = window.location.href; + definition.sentence = sentence; + }); + + const sequence = ++this.sequence; + return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'term-list.html').then(content => { + this.definitions = definitions; + this.pendingLookup = false; + this.showPopup(textSource, content); + return canAddDefinitions(definitions, ['term_kanji', 'term_kana']); + }).then(states => { + if (states !== null) { + states.forEach((state, index) => this.popup.invokeApi('setActionState', {index, state, sequence})); + } + }); + } + }); + } + + showPopup(textSource, content) { + this.popup.showNextTo(textSource.getRect(), content); + + if (this.options.selectMatchedText) { + textSource.select(); + } + + this.lastTextSource = textSource; + } + + hidePopup() { + this.popup.hide(); + + if (this.options.selectMatchedText && this.lastTextSource !== null) { + this.lastTextSource.deselect(); + } + + this.lastTextSource = null; + this.definitions = null; + } + + api_setOptions(opts) { + this.options = opts; + } + + api_setEnabled(enabled) { + if (!(this.enabled = enabled)) { + this.hidePopup(); + } + } + + api_addNote({index, mode}) { + const state = {[mode]: false}; + addDefinition(this.definitions[index], mode).then(success => { + if (success) { + this.popup.invokeApi('setActionState', {index, state, sequence: this.sequence}); + } else { + alert('Note could not be added'); + } + }); + } + + api_playAudio(index) { + const definition = this.definitions[index]; + + let url = `https://assets.languagepod101.com/dictionary/japanese/audiomp3.php?kanji=${encodeURIComponent(definition.expression)}`; + if (definition.reading) { + url += `&kana=${encodeURIComponent(definition.reading)}`; + } + + for (const key in this.audio) { + this.audio[key].pause(); + } + + const audio = this.audio[url] || new Audio(url); + audio.currentTime = 0; + audio.play(); + + this.audio[url] = audio; + } + + api_displayKanji(kanji) { + findKanji(kanji).then(definitions => { + definitions.forEach(definition => definition.url = window.location.href); + + const sequence = ++this.sequence; + return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'kanji-list.html').then(content => { + this.definitions = definitions; + this.popup.setContent(content, definitions); + return canAddDefinitions(definitions, ['kanji']); + }).then(states => { + if (states !== null) { + states.forEach((state, index) => this.popup.invokeApi('setActionState', {index, state, sequence})); + } + }); + }); + } +} + +window.driver = new Driver(); diff --git a/ext/manifest.json b/ext/manifest.json index c3864e10..fcf7cef7 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -16,7 +16,7 @@ "fg/js/source-element.js", "fg/js/popup.js", "fg/js/util.js", - "fg/js/client.js" + "fg/js/driver.js" ], "css": ["fg/css/client.css"] }], -- cgit v1.2.3 From c05f7a7c1cb9f25e3658ced51aefd61233f65bd3 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Fri, 16 Sep 2016 20:28:59 -0700 Subject: Work on progress bar --- ext/bg/guide.html | 29 ----------------------------- ext/bg/import.html | 45 +++++++++++++++++++++++++++++++++++++++++---- ext/bg/js/deinflector.js | 4 ++++ ext/bg/js/import.js | 10 +++++++--- ext/bg/js/yomichan.js | 9 +-------- 5 files changed, 53 insertions(+), 44 deletions(-) delete mode 100644 ext/bg/guide.html (limited to 'ext') diff --git a/ext/bg/guide.html b/ext/bg/guide.html deleted file mode 100644 index a3fa8221..00000000 --- a/ext/bg/guide.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Yomichan Guide - - - - -

- - - -

This is a minimal guide to get you started with Yomichan. For complete documentation, visit the official homepage.

- -

Left-click on the icon to enable or disable Yomichan for the current browser instance.
Right-click on the icon and select Options to open the Yomichan options page.
Hold down Shift or the middle mouse button as you move your cursor over text to see definitions.
Resize the definition window by dragging the bottom-left corner inwards or outwards.
Click on Kanji in the definition window to view additional information about that character.

- -

Enjoy!

- - diff --git a/ext/bg/import.html b/ext/bg/import.html index 85841eee..3dcdfdbd 100644 --- a/ext/bg/import.html +++ b/ext/bg/import.html @@ -5,18 +5,55 @@ Yomichan Dictionary Import +

Importing dictionary data, this can take a while...

Thank you for downloading this extension! I sincerely hope that it will assist you on your language learning journey.

Dictionary Import

+ +

+ Before it can be used for the first time, Yomichan must import the Japanese dictionary data included with this extension. This process can take a + couple of minutes to finish so please be patient! Please do not completely exit out of your browser until this process completes. +

+ +

Dictionary import complete!

+ +

Quick Guide

+ +

+ Please read the steps outlined below to get quickly get up and running with Yomichan. For complete documentation, + visit the official homepage. +

+ +

Left-click on the icon to enable or disable Yomichan for the current browser instance.
Right-click on the icon and select Options to open the Yomichan options page.
Hold down Shift or the middle mouse button as you move your cursor over text to see definitions.
Resize the definitions window by dragging the bottom-left corner inwards or outwards.
Click on Kanji in the definition window to view additional information about that character.

+ +
+ +

よろしくね！

diff --git a/ext/bg/js/deinflector.js b/ext/bg/js/deinflector.js index e5b1efe5..8b9f88e2 100644 --- a/ext/bg/js/deinflector.js +++ b/ext/bg/js/deinflector.js @@ -66,6 +66,10 @@ class Deinflection { } const term = this.term.slice(0, -variant.ki.length) + variant.ko; + if (term.length === 0) { + continue; + } + const child = new Deinflection(term, variant.to, rule); promises.push( child.deinflect(validator, rules).then(valid => { diff --git a/ext/bg/js/import.js b/ext/bg/js/import.js index ebc7c7be..0601cb9f 100644 --- a/ext/bg/js/import.js +++ b/ext/bg/js/import.js @@ -17,9 +17,13 @@ */ -function api_setProgress({state, progress}) { - const str = `${progress}%`; - $('.progress-bar').css('width', str).text(str); +function api_setProgress(progress) { + $('.progress-bar').css('width', `${progress}%`); + + if (progress === 100.0) { + $('.progress').hide(); + $('.alert').show(); + } } chrome.runtime.onMessage.addListener(({action, params}, sender, callback) => { diff --git a/ext/bg/js/yomichan.js b/ext/bg/js/yomichan.js index 24ddf92d..f1b3ffc4 100644 --- a/ext/bg/js/yomichan.js +++ b/ext/bg/js/yomichan.js @@ -28,7 +28,6 @@ class Yomichan { this.ankiConnectVer = 0; this.setState('disabled'); - chrome.runtime.onInstalled.addListener(this.onInstalled.bind(this)); chrome.runtime.onMessage.addListener(this.onMessage.bind(this)); chrome.browserAction.onClicked.addListener(this.onBrowserAction.bind(this)); chrome.tabs.onCreated.addListener(tab => this.onTabReady(tab.id)); @@ -42,19 +41,13 @@ class Yomichan { }); } - onInstalled(details) { - if (details.reason === 'install') { - chrome.tabs.create({url: chrome.extension.getURL('bg/guide.html')}); - } - } - onImport({state, progress}) { if (state === 'begin') { chrome.tabs.create({url: chrome.extension.getURL('bg/import.html')}, tab => this.importTabId = tab.id); } if (this.importTabId !== null) { - this.tabInvoke(this.importTabId, 'setProgress', {state, progress}); + this.tabInvoke(this.importTabId, 'setProgress', progress); } if (state === 'end') { -- cgit v1.2.3 From daf774150db073194b8d57657f69ea14e4639052 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sun, 18 Sep 2016 09:45:39 -0700 Subject: Activate on startup --- ext/bg/js/options.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext') diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index 83eb1f0a..915164c7 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -19,7 +19,7 @@ function sanitizeOptions(options) { const defaults = { - activateOnStartup: false, + activateOnStartup: true, selectMatchedText: true, enableAudioPlayback: true, enableAnkiConnect: false, -- cgit v1.2.3 From 2a65060b73ec07a99df9e5922745427f81ea7e51 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sun, 18 Sep 2016 17:32:57 -0700 Subject: Hold down ctrl to search for kanji, fixes #13 --- ext/fg/js/driver.js | 77 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 19 deletions(-) (limited to 'ext') diff --git a/ext/fg/js/driver.js b/ext/fg/js/driver.js index de097980..68cbcdee 100644 --- a/ext/fg/js/driver.js +++ b/ext/fg/js/driver.js @@ -41,21 +41,23 @@ class Driver { onKeyDown(e) { if (this.enabled && this.lastMousePos !== null && (e.keyCode === 16 || e.charCode === 16)) { - this.searchAt(this.lastMousePos); + this.searchAt(this.lastMousePos, e.ctrlKey ? 'kanji' : 'terms'); + } else { + this.hidePopup(); } } onMouseMove(e) { this.lastMousePos = {x: e.clientX, y: e.clientY}; if (this.enabled && (e.shiftKey || e.which === 2)) { - this.searchAt(this.lastMousePos); + this.searchAt(this.lastMousePos, e.ctrlKey ? 'kanji' : 'terms'); } } onMouseDown(e) { this.lastMousePos = {x: e.clientX, y: e.clientY}; if (this.enabled && (e.shiftKey || e.which === 2)) { - this.searchAt(this.lastMousePos); + this.searchAt(this.lastMousePos, e.ctrlKey ? 'kanji' : 'terms'); } else { this.hidePopup(); } @@ -77,26 +79,12 @@ class Driver { } } - searchAt(point) { - if (this.pendingLookup) { - return; - } - - const textSource = textSourceFromPoint(point); - if (textSource === null || !textSource.containsPoint(point)) { - this.hidePopup(); - return; - } - - if (this.lastTextSource !== null && this.lastTextSource.equals(textSource)) { - return; - } - + searchTerms(textSource) { textSource.setEndOffset(this.options.scanLength); this.pendingLookup = true; findTerm(textSource.text()).then(({definitions, length}) => { - if (length === 0) { + if (definitions.length === 0) { this.pendingLookup = false; this.hidePopup(); } else { @@ -123,6 +111,57 @@ class Driver { }); } + searchKanji(textSource) { + textSource.setEndOffset(1); + + this.pendingLookup = true; + findKanji(textSource.text()).then(definitions => { + if (definitions.length === 0) { + this.pendingLookup = false; + this.hidePopup(); + } else { + definitions.forEach(definition => definition.url = window.location.href); + + const sequence = ++this.sequence; + return renderText({definitions, sequence, root: this.fgRoot, options: this.options}, 'kanji-list.html').then(content => { + this.definitions = definitions; + this.pendingLookup = false; + this.showPopup(textSource, content); + return canAddDefinitions(definitions, ['kanji']); + }).then(states => { + if (states !== null) { + states.forEach((state, index) => this.popup.invokeApi('setActionState', {index, state, sequence})); + } + }); + } + }); + } + + searchAt(point, mode) { + if (this.pendingLookup) { + return; + } + + const textSource = textSourceFromPoint(point); + if (textSource === null || !textSource.containsPoint(point)) { + this.hidePopup(); + return; + } + + if (this.lastTextSource !== null && this.lastTextSource.equals(textSource)) { + return; + } + + switch (mode) { + case 'terms': + this.searchTerms(textSource); + break; + case 'kanji': + this.searchKanji(textSource); + break; + } + } + showPopup(textSource, content) { this.popup.showNextTo(textSource.getRect(), content); -- cgit v1.2.3 From 4e2d7327c5b1aa8eed035dc4c177a3b9b49c5ab7 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sun, 18 Sep 2016 19:49:59 -0700 Subject: Bumping version number --- ext/bg/import.html | 2 +- ext/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ext') diff --git a/ext/bg/import.html b/ext/bg/import.html index 3dcdfdbd..b5d2db68 100644 --- a/ext/bg/import.html +++ b/ext/bg/import.html @@ -45,7 +45,7 @@

Left-click on the icon to enable or disable Yomichan for the current browser instance.
Right-click on the icon and select Options to open the Yomichan options page.
Hold down Shift or the middle mouse button as you move your cursor over text to see definitions.
Hold down Shift or the middle mouse button as you move your cursor over text to see definitions (or Shift + Ctrl for Kanji).
Resize the definitions window by dragging the bottom-left corner inwards or outwards.
Click on Kanji in the definition window to view additional information about that character.

diff --git a/ext/manifest.json b/ext/manifest.json index fcf7cef7..f8c55172 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Yomichan", - "version": "0.97", + "version": "0.98", "description": "Japanese dictionary with Anki integration", "icons": {"16": "img/icon16.png", "48": "img/icon48.png", "128": "img/icon128.png"}, -- cgit v1.2.3

Yomichan Guide

Yomichan Dictionary Import

Welcome to Yomichan!

Dictionary Import

Quick Guide

Yomichan Dictionary Import

General Options