alex/yomichan
1
Fork 0
Code Releases Activity

Text scanner refactoring (#812)

Browse Source 
* Add functions _onPrimaryTouchStart and _onPrimaryTouchEnd

* Add "type" to input details
This commit is contained in:
toasted-nutbread 2020-09-11 20:24:51 -04:00 committed by GitHub
parent 6e7b9fcf99
commit e56674e4ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,7 +277,7 @@ class TextScanner extends EventDispatcher {
_onClick(e) { _onClick(e) {
if (this._searchOnClick) { if (this._searchOnClick) {
this._searchAt(e.clientX, e.clientY, {cause: 'click', index: -1, empty: false}); this._searchAt(e.clientX, e.clientY, {type: 'mouse', cause: 'click', index: -1, empty: false});
} }
if (this._preventNextClick) { if (this._preventNextClick) {
@ -306,19 +306,23 @@ class TextScanner extends EventDispatcher {
return; return;
} }
const {clientX, clientY, identifier} = e.changedTouches[0];
this._onPrimaryTouchStart(e, clientX, clientY, identifier);
}
_onPrimaryTouchStart(e, x, y, identifier) {
this._preventScroll = false; this._preventScroll = false;
this._preventNextContextMenu = false; this._preventNextContextMenu = false;
this._preventNextMouseDown = false; this._preventNextMouseDown = false;
this._preventNextClick = false; this._preventNextClick = false;
const primaryTouch = e.changedTouches[0]; if (DocumentUtil.isPointInSelection(x, y, window.getSelection())) {
if (DocumentUtil.isPointInSelection(primaryTouch.clientX, primaryTouch.clientY, window.getSelection())) {
return; return;
} }
this._primaryTouchIdentifier = primaryTouch.identifier; this._primaryTouchIdentifier = identifier;
this._searchAtFromTouchStart(e, primaryTouch.clientX, primaryTouch.clientY); this._searchAtFromTouchStart(e, x, y);
} }
_onTouchEnd(e) { _onTouchEnd(e) {
@ -329,6 +333,10 @@ class TextScanner extends EventDispatcher {
return; return;
} }
this._onPrimaryTouchEnd();
}
_onPrimaryTouchEnd() {
this._primaryTouchIdentifier = null; this._primaryTouchIdentifier = null;
this._preventScroll = false; this._preventScroll = false;
this._preventNextClick = false; this._preventNextClick = false;
@ -350,11 +358,12 @@ class TextScanner extends EventDispatcher {
return; return;
} }
const inputInfo = this._getMatchingInputGroupFromEvent(e, 'touch'); const type = 'touch';
const inputInfo = this._getMatchingInputGroupFromEvent(e, type);
if (inputInfo === null) { return; } if (inputInfo === null) { return; }
const {index, empty} = inputInfo; const {index, empty} = inputInfo;
this._searchAt(primaryTouch.clientX, primaryTouch.clientY, {cause: 'touchMove', index, empty}); this._searchAt(primaryTouch.clientX, primaryTouch.clientY, {type, cause: 'touchMove', index, empty});
e.preventDefault(); // Disable scroll e.preventDefault(); // Disable scroll
} }
@ -502,19 +511,21 @@ class TextScanner extends EventDispatcher {
} }
} }
await this._searchAt(x, y, {cause: 'mouse', index: inputIndex, empty: inputEmpty}); await this._searchAt(x, y, {type: 'mouse', cause: 'mouse', index: inputIndex, empty: inputEmpty});
} }
async _searchAtFromTouchStart(e, x, y) { async _searchAtFromTouchStart(e, x, y) {
if (this._pendingLookup) { return; } if (this._pendingLookup) { return; }
const inputInfo = this._getMatchingInputGroupFromEvent(e, 'touch'); const type = 'touch';
const cause = 'touchStart';
const inputInfo = this._getMatchingInputGroupFromEvent(e, type);
if (inputInfo === null) { return; } if (inputInfo === null) { return; }
const {index, empty} = inputInfo; const {index, empty} = inputInfo;
const textSourceCurrentPrevious = this._textSourceCurrent !== null ? this._textSourceCurrent.clone() : null; const textSourceCurrentPrevious = this._textSourceCurrent !== null ? this._textSourceCurrent.clone() : null;
await this._searchAt(x, y, {cause: 'touchStart', index, empty}); await this._searchAt(x, y, {type, cause, index, empty});
if ( if (
this._textSourceCurrent !== null && this._textSourceCurrent !== null &&