alex/yomichan
1
Fork 0
Code Releases Activity

Replace getIndexOfTouch with getTouch

Browse Source
This commit is contained in:
toasted-nutbread 2020-02-15 13:46:21 -05:00
parent 7afc23427e
commit b0c566417f
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ext/mixed/js/text-scanner.js
View File

@ -158,7 +158,7 @@ class TextScanner {
onTouchEnd(e) { onTouchEnd(e) {
if ( if (
this.primaryTouchIdentifier === null || this.primaryTouchIdentifier === null ||
TextScanner.getIndexOfTouch(e.changedTouches, this.primaryTouchIdentifier) < 0 TextScanner.getTouch(e.changedTouches, this.primaryTouchIdentifier) === null
) { ) {
return; return;
} }
@ -181,13 +181,11 @@ class TextScanner {
return; return;
} }
const touches = e.changedTouches; const primaryTouch = TextScanner.getTouch(e.changedTouches, this.primaryTouchIdentifier);
const index = TextScanner.getIndexOfTouch(touches, this.primaryTouchIdentifier); if (primaryTouch === null) {
if (index < 0) {
return; return;
} }
const primaryTouch = touches[index];
this.searchAt(primaryTouch.clientX, primaryTouch.clientY, 'touchMove'); this.searchAt(primaryTouch.clientX, primaryTouch.clientY, 'touchMove');
e.preventDefault(); // Disable scroll e.preventDefault(); // Disable scroll
@ -356,13 +354,12 @@ class TextScanner {
} }
} }
static getIndexOfTouch(touchList, identifier) { static getTouch(touchList, identifier) {
for (const i in touchList) { for (const touch of touchList) {
const t = touchList[i]; if (touch.identifier === identifier) {
if (t.identifier === identifier) { return touch;
return i;
} }
} }
return -1; return null;
} }
} }