alex/yomichan
1
Fork 0
Code Releases Activity

Create single function for how the frontend shows popup content

Browse Source
This commit is contained in:
toasted-nutbread 2019-12-23 13:58:33 -05:00
parent 8ef57936d7
commit 14e48cf854
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ext/fg/js/frontend.js
View File

@ -53,10 +53,7 @@ class Frontend extends TextScanner {
async onResize() {
const textSource = this.textSourceCurrent;
if (textSource !== null && await this.popup.isVisible()) {
this._lastShowPromise = this.popup.showContent(
textSource.getRect(),
textSource.getWritingMode()
);
this._showPopupContent(textSource);
}
}
@ -111,11 +108,7 @@ class Frontend extends TextScanner {
} catch (e) {
if (this._orphaned) {
if (textSource !== null && this.options.scanning.modifier !== 'none') {
this._lastShowPromise = this.popup.showContent(
textSource.getRect(),
textSource.getWritingMode(),
'orphaned'
);
this._showPopupContent(textSource, 'orphaned');
}
} else {
this.onError(e);
@ -132,9 +125,8 @@ class Frontend extends TextScanner {
showContent(textSource, focus, definitions, type) {
const sentence = docSentenceExtract(textSource, this.options.anki.sentenceExt);
const url = window.location.href;
this._lastShowPromise = this.popup.showContent(
textSource.getRect(),
textSource.getWritingMode(),
this._showPopupContent(
textSource,
type,
{definitions, context: {sentence, url, focus, disableHistory: true}}
);
@ -180,6 +172,16 @@ class Frontend extends TextScanner {
this.optionsContext.url = this.popup.url;
return this.optionsContext;
}
_showPopupContent(textSource, type=null, details=null) {
this._lastShowPromise = this.popup.showContent(
textSource.getRect(),
textSource.getWritingMode(),
type,
details
);
return this._lastShowPromise;
}
}
Frontend._windowMessageHandlers = new Map([