alex/yomichan
1
Fork 0
Code Releases Activity

Rename type to cause

Browse Source
This commit is contained in:
toasted-nutbread 2019-09-14 14:31:21 -04:00
parent 6d3037f3d6
commit 7dddcb8dca
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,8 +219,8 @@ class Frontend {
} }
} }
onAfterSearch(newRange, type, searched, success) { onAfterSearch(newRange, cause, searched, success) {
if (type === 'mouse') { if (cause === 'mouse') {
return; return;
} }
@ -230,7 +230,7 @@ class Frontend {
return; return;
} }
if (type === 'touchStart' && newRange !== null) { if (cause === 'touchStart' && newRange !== null) {
this.scrollPrevent = true; this.scrollPrevent = true;
} }
@ -280,7 +280,7 @@ class Frontend {
} }
} }
async searchAt(x, y, type) { async searchAt(x, y, cause) {
if (this.pendingLookup || await this.popup.containsPoint(x, y)) { if (this.pendingLookup || await this.popup.containsPoint(x, y)) {
return; return;
} }
@ -294,7 +294,7 @@ class Frontend {
if (!hideResults && (!this.textSourceLast || !this.textSourceLast.equals(textSource))) { if (!hideResults && (!this.textSourceLast || !this.textSourceLast.equals(textSource))) {
searched = true; searched = true;
this.pendingLookup = true; this.pendingLookup = true;
const focus = (type === 'mouse'); const focus = (cause === 'mouse');
hideResults = !await this.searchTerms(textSource, focus) && !await this.searchKanji(textSource, focus); hideResults = !await this.searchTerms(textSource, focus) && !await this.searchKanji(textSource, focus);
success = true; success = true;
} }
@ -319,7 +319,7 @@ class Frontend {
} }
this.pendingLookup = false; this.pendingLookup = false;
this.onAfterSearch(this.textSourceLast, type, searched, success); this.onAfterSearch(this.textSourceLast, cause, searched, success);
} }
} }
@ -461,7 +461,7 @@ class Frontend {
this.clickPrevent = value; this.clickPrevent = value;
} }
searchFromTouch(x, y, type) { searchFromTouch(x, y, cause) {
this.popupTimerClear(); this.popupTimerClear();
if (!this.options.general.enable || this.pendingLookup) { if (!this.options.general.enable || this.pendingLookup) {
@ -470,7 +470,7 @@ class Frontend {
const search = async () => { const search = async () => {
try { try {
await this.searchAt(x, y, type); await this.searchAt(x, y, cause);
} catch (e) { } catch (e) {
this.onError(e); this.onError(e);
} }