alex/yomichan
1
Fork 0
Code Releases Activity

Remove setPrimaryTouch

Browse Source
This commit is contained in:
toasted-nutbread 2019-10-24 21:38:19 -04:00
parent 80eb357527
commit 9703e123bf
1 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,28 @@ class Frontend {
return; return;
} }
this.setPrimaryTouch(primaryTouch); this.primaryTouchIdentifier = primaryTouch.identifier;
this.preventScroll = false;
this.preventNextContextMenu = false;
this.preventNextMouseDown = false;
this.preventNextClick = false;
const textSourceCurrentPrevious = this.textSourceCurrent !== null ? this.textSourceCurrent.clone() : null;
this.searchAt(primaryTouch.clientX, primaryTouch.clientY, 'touchStart')
.then(() => {
if (
this.pendingLookup ||
this.textSourceCurrent === null ||
this.textSourceCurrent.equals(textSourceCurrentPrevious)
) {
return;
}
this.preventScroll = true;
this.preventNextContextMenu = true;
this.preventNextMouseDown = true;
});
} }
onTouchEnd(e) { onTouchEnd(e) {
@ -179,7 +200,13 @@ class Frontend {
return; return;
} }
this.setPrimaryTouch(null); this.primaryTouchIdentifier = null;
this.preventScroll = false;
this.preventNextClick = false;
// Don't revert context menu and mouse down prevention,
// since these events can occur after the touch has ended.
// this.preventNextContextMenu = false;
// this.preventNextMouseDown = false;
} }
onTouchCancel(e) { onTouchCancel(e) {
@ -419,42 +446,6 @@ class Frontend {
return -1; return -1;
} }
setPrimaryTouch(touch) {
if (touch === null) {
this.primaryTouchIdentifier = null;
this.preventScroll = false;
this.preventNextClick = false;
// Don't revert context menu and mouse down prevention,
// since these events can occur after the touch has ended.
// this.preventNextContextMenu = false;
// this.preventNextMouseDown = false;
}
else {
this.primaryTouchIdentifier = touch.identifier;
this.preventScroll = false;
this.preventNextContextMenu = false;
this.preventNextMouseDown = false;
this.preventNextClick = false;
const textSourceCurrentPrevious = this.textSourceCurrent !== null ? this.textSourceCurrent.clone() : null;
this.searchAt(touch.clientX, touch.clientY, 'touchStart')
.then(() => {
if (
this.pendingLookup ||
this.textSourceCurrent === null ||
this.textSourceCurrent.equals(textSourceCurrentPrevious)
) {
return;
}
this.preventScroll = true;
this.preventNextContextMenu = true;
this.preventNextMouseDown = true;
});
}
}
static selectionContainsPoint(selection, x, y) { static selectionContainsPoint(selection, x, y) {
for (let i = 0; i < selection.rangeCount; ++i) { for (let i = 0; i < selection.rangeCount; ++i) {
const range = selection.getRangeAt(i); const range = selection.getRangeAt(i);