alex/yomichan
1
Fork 0
Code Releases Activity

Remove mouseDownLeft and mouseDownMiddle

Browse Source 
MouseEvent.buttons can be used instead.
This commit is contained in:
toasted-nutbread 2019-09-14 14:11:06 -04:00
parent ec816e6767
commit 721248c821
1 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,8 +21,6 @@ class Frontend {
constructor(popup, ignoreNodes) { constructor(popup, ignoreNodes) {
this.popup = popup; this.popup = popup;
this.popupTimer = null; this.popupTimer = null;
this.mouseDownLeft = false;
this.mouseDownMiddle = false;
this.textSourceLast = null; this.textSourceLast = null;
this.pendingLookup = false; this.pendingLookup = false;
this.options = null; this.options = null;
@ -61,7 +59,6 @@ class Frontend {
window.addEventListener('mousemove', this.onMouseMove.bind(this)); window.addEventListener('mousemove', this.onMouseMove.bind(this));
window.addEventListener('mouseover', this.onMouseOver.bind(this)); window.addEventListener('mouseover', this.onMouseOver.bind(this));
window.addEventListener('mouseout', this.onMouseOut.bind(this)); window.addEventListener('mouseout', this.onMouseOut.bind(this));
window.addEventListener('mouseup', this.onMouseUp.bind(this));
window.addEventListener('resize', this.onResize.bind(this)); window.addEventListener('resize', this.onResize.bind(this));
if (this.options.scanning.touchInputEnabled) { if (this.options.scanning.touchInputEnabled) {
@ -88,26 +85,20 @@ class Frontend {
onMouseMove(e) { onMouseMove(e) {
this.popupTimerClear(); this.popupTimerClear();
if (!this.options.general.enable) { if (
this.pendingLookup ||
!this.options.general.enable ||
(e.buttons & 0x1) !== 0x0 // Left mouse button
) {
return; return;
} }
if (this.mouseDownLeft) { const scanningOptions = this.options.scanning;
return; const scanningModifier = scanningOptions.modifier;
} if (!(
Frontend.isScanningModifierPressed(scanningModifier, e) ||
if (this.pendingLookup) { (scanningOptions.middleMouse && (e.buttons & 0x4) !== 0x0) // Middle mouse button
return; )) {
}
const mouseScan = this.mouseDownMiddle && this.options.scanning.middleMouse;
const keyScan =
this.options.scanning.modifier === 'alt' && e.altKey ||
this.options.scanning.modifier === 'ctrl' && e.ctrlKey ||
this.options.scanning.modifier === 'shift' && e.shiftKey ||
this.options.scanning.modifier === 'none';
if (!keyScan && !mouseScan) {
return; return;
} }
@ -119,7 +110,7 @@ class Frontend {
} }
}; };
if (this.options.scanning.modifier === 'none') { if (scanningModifier === 'none') {
this.popupTimerSet(search); this.popupTimerSet(search);
} else { } else {
search(); search();
@ -138,20 +129,6 @@ class Frontend {
this.mousePosLast = {x: e.clientX, y: e.clientY}; this.mousePosLast = {x: e.clientX, y: e.clientY};
this.popupTimerClear(); this.popupTimerClear();
this.searchClear(); this.searchClear();
if (e.which === 1) {
this.mouseDownLeft = true;
} else if (e.which === 2) {
this.mouseDownMiddle = true;
}
}
onMouseUp(e) {
if (e.which === 1) {
this.mouseDownLeft = false;
} else if (e.which === 2) {
this.mouseDownMiddle = false;
}
} }
onMouseOut(e) { onMouseOut(e) {
@ -531,6 +508,16 @@ class Frontend {
textSource.setEndOffset(length); textSource.setEndOffset(length);
} }
} }
static isScanningModifierPressed(scanningModifier, mouseEvent) {
switch (scanningModifier) {
case 'alt': return mouseEvent.altKey;
case 'ctrl': return mouseEvent.ctrlKey;
case 'shift': return mouseEvent.shiftKey;
case 'none': return true;
default: return false;
}
}
} }
window.yomichan_frontend = Frontend.create(); window.yomichan_frontend = Frontend.create();