alex/yomichan
1
Fork 0
Code Releases Activity

cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2017-03-24 22:49:14 -07:00
parent a9cc121860
commit 5989c5faae
1 changed files with 34 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,8 +55,8 @@ class Display {
this.spinner.hide(); this.spinner.hide();
this.definitions = definitions; this.definitions = definitions;
this.context = context;
this.options = options; this.options = options;
this.context = context;
const sequence = ++this.sequence; const sequence = ++this.sequence;
const params = { const params = {
@ -75,9 +75,7 @@ class Display {
this.templateRender('terms.html', params).then(content => { this.templateRender('terms.html', params).then(content => {
this.container.html(content); this.container.html(content);
this.entryScroll(context && context.index || 0);
const index = context && context.hasOwnProperty('index') ? context.index : 0;
this.entryScroll(index);
$('.action-add-note').click(this.onAddNote.bind(this)); $('.action-add-note').click(this.onAddNote.bind(this));
$('.action-play-audio').click(this.onPlayAudio.bind(this)); $('.action-play-audio').click(this.onPlayAudio.bind(this));
@ -92,8 +90,8 @@ class Display {
this.spinner.hide(); this.spinner.hide();
this.definitions = definitions; this.definitions = definitions;
this.context = context;
this.options = options; this.options = options;
this.context = context;
const sequence = ++this.sequence; const sequence = ++this.sequence;
const params = { const params = {
@ -111,9 +109,7 @@ class Display {
this.templateRender('kanji.html', params).then(content => { this.templateRender('kanji.html', params).then(content => {
this.container.html(content); this.container.html(content);
this.entryScroll(context && context.index || 0);
const index = context && context.hasOwnProperty('index') ? context.index : 0;
this.entryScroll(index);
$('.action-add-note').click(this.onAddNote.bind(this)); $('.action-add-note').click(this.onAddNote.bind(this));
$('.source-term').click(this.onSourceTerm.bind(this)); $('.source-term').click(this.onSourceTerm.bind(this));
@ -183,34 +179,32 @@ class Display {
const link = $(e.target); const link = $(e.target);
const context = { const context = {
source: { source: {
definitions, definitions: this.definitions,
index: Display.entryIndexFind(link) index: Display.entryIndexFind(link)
} }
}; };
if (this.context) { if (this.context) {
context.sentence = this.context.sentence || ''; context.sentence = this.context.sentence;
context.url = this.context.url || ''; context.url = this.context.url;
} }
this.kanjiFind(link.text()).then(kanjiDefs => { this.kanjiFind(link.text()).then(kanjiDefs => {
this.showKanjiDefs(kanjiDefs, options, context); this.showKanjiDefs(kanjiDefs, this.options, context);
}).catch(this.handleError.bind(this)); }).catch(this.handleError.bind(this));
} }
onPlayAudio(e) { onPlayAudio(e) {
e.preventDefault(); e.preventDefault();
const index = Display.entryIndexFind($(e.currentTarget)); const index = Display.entryIndexFind($(e.currentTarget));
this.audioPlay(this.definitions[index]); this.audioPlay(this.definitions[index]);
} }
onAddNote(e) { onAddNote(e) {
e.preventDefault(); e.preventDefault();
const link = $(e.currentTarget); const link = $(e.currentTarget);
const index = Display.entryIndexFind(link); const index = Display.entryIndexFind(link);
this.noteAdd(index, link.data('mode')); this.noteAdd(this.definitions[index], link.data('mode'));
} }
onKeyDown(e) { onKeyDown(e) {
@ -255,14 +249,8 @@ class Display {
} }
} }
sourceTerm(index) { noteAdd(definition, mode) {
}
noteAdd(index, mode) {
this.spinner.show(); this.spinner.show();
const definition = this.definitions[index];
let promise = Promise.resolve(); let promise = Promise.resolve();
if (mode !== 'kanji') { if (mode !== 'kanji') {
@ -275,6 +263,7 @@ class Display {
promise.then(() => { promise.then(() => {
return this.definitionAdd(definition, mode).then(success => { return this.definitionAdd(definition, mode).then(success => {
if (success) { if (success) {
const index = this.definitions.indexOf(definition);
Display.adderButtonFind(index, mode).addClass('disabled'); Display.adderButtonFind(index, mode).addClass('disabled');
} else { } else {
this.handleError('note could not be added'); this.handleError('note could not be added');
@ -283,9 +272,8 @@ class Display {
}).catch(this.handleError.bind(this)).then(() => this.spinner.hide()); }).catch(this.handleError.bind(this)).then(() => this.spinner.hide());
} }
audioPlay(index) { audioPlay(definition) {
this.spinner.show(); this.spinner.show();
const definition = this.definitions[index];
for (const key in this.audioCache) { for (const key in this.audioCache) {
this.audioCache[key].pause(); this.audioCache[key].pause();
@ -319,9 +307,7 @@ class Display {
const response = this.responseCache[definition.expression]; const response = this.responseCache[definition.expression];
if (response) { if (response) {
resolve(response); resolve(response);
return; } else {
}
const data = { const data = {
post: 'dictionary_reference', post: 'dictionary_reference',
match_type: 'exact', match_type: 'exact',
@ -343,6 +329,7 @@ class Display {
}); });
xhr.send(params.join('&')); xhr.send(params.join('&'));
}
}).then(response => { }).then(response => {
const dom = new DOMParser().parseFromString(response, 'text/html'); const dom = new DOMParser().parseFromString(response, 'text/html');
const entries = []; const entries = [];