alex/yomichan
1
Fork 0
Code Releases Activity

Display try catch refactor (#704)

Browse Source 
* Remove try-catch from _termLookup

Already handled by _onTermLookup

* Move try-catch out of _onTermLookup and into _onGlossaryMouseUp
This commit is contained in:
toasted-nutbread 2020-08-01 16:33:21 -04:00 committed by GitHub
parent f271c83d77
commit a562a11498
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -521,12 +521,15 @@ class Display extends EventDispatcher {
_onGlossaryMouseUp(e) { _onGlossaryMouseUp(e) {
if (!this._clickScanPrevent && DOM.isMouseButtonPressed(e, 'primary')) { if (!this._clickScanPrevent && DOM.isMouseButtonPressed(e, 'primary')) {
try {
this._onTermLookup(e); this._onTermLookup(e);
} catch (error) {
this.onError(error);
}
} }
} }
async _onTermLookup(e) { async _onTermLookup(e) {
try {
if (!this._historyHasState()) { return; } if (!this._historyHasState()) { return; }
const termLookupResults = await this._termLookup(e); const termLookupResults = await this._termLookup(e);
@ -560,13 +563,9 @@ class Display extends EventDispatcher {
} }
}; };
this.setContent(details); this.setContent(details);
} catch (error) {
this.onError(error);
}
} }
async _termLookup(e) { async _termLookup(e) {
try {
e.preventDefault(); e.preventDefault();
const {length: scanLength, deepDomScan: deepScan, layoutAwareScan} = this._options.scanning; const {length: scanLength, deepDomScan: deepScan, layoutAwareScan} = this._options.scanning;
@ -590,9 +589,6 @@ class Display extends EventDispatcher {
} }
return {textSource, definitions}; return {textSource, definitions};
} catch (error) {
this.onError(error);
}
} }
_onAudioPlay(e) { _onAudioPlay(e) {