alex/yomichan
1
Fork 0
Code Releases Activity

wip

Browse Source
This commit is contained in:
Alex Yatskov 2017-03-19 15:45:30 -07:00
parent 6d55767191
commit 55309c1cb3
1 changed files with 79 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,8 @@ class Display {
this.spinner.hide(); this.spinner.hide();
this.definitions = definitions; this.definitions = definitions;
this.context = context;
this.options = options;
const sequence = ++this.sequence; const sequence = ++this.sequence;
const params = { const params = {
@ -76,26 +78,9 @@ class Display {
const index = context && context.hasOwnProperty('index') ? context.index : 0; const index = context && context.hasOwnProperty('index') ? context.index : 0;
this.entryScroll(index); this.entryScroll(index);
$('.action-add-note').click(this.onActionAddNote.bind(this)); $('.action-add-note').click(this.onAddNote.bind(this));
$('.action-play-audio').click(e => { $('.action-play-audio').click(this.onPlayAudio.bind(this));
e.preventDefault(); $('.kanji-link').click(this.onKanjiLookup.bind(this));
const index = Display.entryIndexFind($(e.currentTarget));
this.audioPlay(this.definitions[index]);
});
$('.kanji-link').click(e => {
e.preventDefault();
const link = $(e.target);
context = context || {};
context.source = {
definitions,
index: Display.entryIndexFind(link)
};
this.kanjiFind(link.text()).then(kanjiDefs => {
this.showKanjiDefs(kanjiDefs, options, context);
}).catch(this.handleError.bind(this));
});
return this.adderButtonsUpdate(['term-kanji', 'term-kana'], sequence); return this.adderButtonsUpdate(['term-kanji', 'term-kana'], sequence);
}).catch(this.handleError.bind(this)); }).catch(this.handleError.bind(this));
@ -106,6 +91,8 @@ class Display {
this.spinner.hide(); this.spinner.hide();
this.definitions = definitions; this.definitions = definitions;
this.context = context;
this.options = options;
const sequence = ++this.sequence; const sequence = ++this.sequence;
const params = { const params = {
@ -127,15 +114,8 @@ class Display {
const index = context && context.hasOwnProperty('index') ? context.index : 0; const index = context && context.hasOwnProperty('index') ? context.index : 0;
this.entryScroll(index); this.entryScroll(index);
$('.action-add-note').click(this.onActionAddNote.bind(this)); $('.action-add-note').click(this.onAddNote.bind(this));
$('.source-term').click(e => { $('.source-term').click(this.onSourceTerm.bind(this));
e.preventDefault();
if (context && context.source) {
context.index = context.source.index;
this.showTermDefs(context.source.definitions, options, context);
}
});
return this.adderButtonsUpdate(['kanji'], sequence); return this.adderButtonsUpdate(['kanji'], sequence);
}).catch(this.handleError.bind(this)); }).catch(this.handleError.bind(this));
@ -182,30 +162,54 @@ class Display {
this.index = index; this.index = index;
} }
onActionAddNote(e) { onSourceTerm(e) {
e.preventDefault(); e.preventDefault();
this.spinner.show();
const link = $(e.currentTarget); if (this.context && this.context.source) {
const mode = link.data('mode'); const context = {
const index = Display.entryIndexFind(link); url: this.context.source.url,
const definition = this.definitions[index]; sentence: this.context.source.sentence,
index: this.context.source.index
};
if (mode !== 'kanji') { this.showTermDefs(this.context.source.definitions, this.options, context);
const url = Display.audioBuildUrl(definition); }
const filename = Display.audioBuildFilename(definition); }
if (url && filename) {
definition.audio = {url, filename}; onKanjiLookup(e) {
e.preventDefault();
const link = $(e.target);
const context = {
source: {
definitions,
index: Display.entryIndexFind(link)
} }
};
if (this.context) {
context.sentence = this.context.sentence || '';
context.url = this.context.url || '';
} }
this.definitionAdd(definition, mode).then(success => { this.kanjiFind(link.text()).then(kanjiDefs => {
if (success) { this.showKanjiDefs(kanjiDefs, options, context);
Display.adderButtonFind(index, mode).addClass('disabled'); }).catch(this.handleError.bind(this));
} else { }
this.handleError('note could not be added');
} onPlayAudio(e) {
}).catch(this.handleError.bind(this)).then(() => this.spinner.hide()); e.preventDefault();
const index = Display.entryIndexFind($(e.currentTarget));
this.audioPlay(this.definitions[index]);
}
onAddNote(e) {
e.preventDefault();
const link = $(e.currentTarget);
const index = Display.entryIndexFind(link);
this.noteAdd(index, link.data('mode'));
} }
onKeyDown(e) { onKeyDown(e) {
@ -250,7 +254,33 @@ class Display {
} }
} }
audioPlay(definition) { sourceTerm(index) {
}
noteAdd(index, mode) {
this.spinner.show();
const definition = this.definitions[index];
if (mode !== 'kanji') {
const url = Display.audioBuildUrl(definition);
const filename = Display.audioBuildFilename(definition);
if (url && filename) {
definition.audio = {url, filename};
}
}
this.definitionAdd(definition, mode).then(success => {
if (success) {
Display.adderButtonFind(index, mode).addClass('disabled');
} else {
this.handleError('note could not be added');
}
}).catch(this.handleError.bind(this)).then(() => this.spinner.hide());
}
audioPlay(index) {
for (const key in this.audioCache) { for (const key in this.audioCache) {
const audio = this.audioCache[key]; const audio = this.audioCache[key];
if (audio !== null) { if (audio !== null) {
@ -258,6 +288,7 @@ class Display {
} }
} }
const definition = this.definitions[index];
const url = Display.audioBuildUrl(definition); const url = Display.audioBuildUrl(definition);
if (!url) { if (!url) {
return; return;