alex/yomichan
1
Fork 0
Code Releases Activity

Use promiseTimeout

Browse Source
This commit is contained in:
toasted-nutbread 2019-10-24 19:38:29 -04:00
parent d608657495
commit 185963899b
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@
class Frontend {
constructor(popup, ignoreNodes) {
this.popup = popup;
this.popupTimer = null;
this.popupTimerPromise = null;
this.textSourceLast = null;
this.pendingLookup = false;
this.options = null;
@ -74,7 +74,7 @@ class Frontend {
}
onMouseOver(e) {
if (e.target === this.popup.container && this.popupTimer !== null) {
if (e.target === this.popup.container) {
this.popupTimerClear();
}
}
@ -99,15 +99,18 @@ class Frontend {
}
const search = async () => {
if (scanningModifier === 'none') {
if (!await this.popupTimerWait()) {
// Aborted
return;
}
}
await this.searchAt(e.clientX, e.clientY, 'mouse');
};
if (scanningModifier === 'none') {
this.popupTimerSet(search);
} else {
search();
}
}
onMouseDown(e) {
if (this.mouseDownPrevent) {
@ -293,19 +296,19 @@ class Frontend {
await this.popup.setOptions(this.options);
}
popupTimerSet(callback) {
async popupTimerWait() {
const delay = this.options.scanning.delay;
if (delay > 0) {
this.popupTimer = window.setTimeout(callback, delay);
} else {
Promise.resolve().then(callback);
this.popupTimerPromise = promiseTimeout(delay, true);
try {
return await this.popupTimerPromise;
} finally {
this.popupTimerPromise = null;
}
}
popupTimerClear() {
if (this.popupTimer !== null) {
window.clearTimeout(this.popupTimer);
this.popupTimer = null;
if (this.popupTimerPromise !== null) {
this.popupTimerPromise.resolve(false);
}
}