alex/yomichan
1
Fork 0
Code Releases Activity

cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2017-01-09 09:30:56 -08:00
parent 60e23ab42c
commit 89070c6096
3 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/fg/js/driver.js
View File

@ -146,13 +146,7 @@ class Driver {
searchTerms(textSource) {
textSource.setEndOffset(this.options.scanLength);
let findFunc = findTerm;
let showFunc = this.popup.showTermDefs.bind(this.popup);
if (this.options.groupTermResults) {
findFunc = findTermGrouped;
showFunc = this.popup.showTermGroupedDefs.bind(this.popup);
}
const findFunc = this.options.groupTermResults ? findTermGrouped : findTerm;
return findFunc(textSource.text()).then(({definitions, length}) => {
if (definitions.length === 0) {
return false;
@ -166,7 +160,7 @@ class Driver {
});
this.popup.showNextTo(textSource.getRect());
showFunc(definitions, this.options);
this.popup.showTermDefs(definitions, this.options);
this.lastTextSource = textSource;
if (this.options.selectMatchedText) {
textSource.select();

32
ext/fg/js/frame.js
View File

@ -62,38 +62,6 @@ class Frame {
});
}
api_showTermGroupedDefs({definitions, options}) {
const sequence = ++this.sequence;
const context = {
definitions,
grouped: options.groupTermResults,
addable: options.ankiMethod !== 'disabled',
playback: options.enableAudioPlayback
};
this.definitions = definitions;
this.showSpinner(false);
window.scrollTo(0, 0);
renderText(context, 'term-list.html').then(content => {
$('.content').html(content);
$('.action-add-note').click(this.onAddNote.bind(this));
$('.kanji-link').click(e => {
e.preventDefault();
findKanji($(e.target).text()).then(kdefs => this.api_showKanjiDefs({options, definitions: kdefs}));
});
$('.action-play-audio').click(e => {
e.preventDefault();
const index = $(e.currentTarget).data('index');
this.playAudio(this.definitions[index]);
});
this.updateAddNoteButtons(['term_kanji', 'term_kana'], sequence);
});
}
api_showKanjiDefs({definitions, options}) {
const sequence = ++this.sequence;
const context = {

4
ext/fg/js/popup.js
View File

@ -74,10 +74,6 @@ class Popup {
this.invokeApi('showTermDefs', {definitions, options});
}
showTermGroupedDefs(definitions, options) {
this.invokeApi('showTermGroupedDefs', {definitions, options});
}
showKanjiDefs(definitions, options) {
this.invokeApi('showKanjiDefs', {definitions, options});
}