mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-25 14:46:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1754 from lunit-io/master

Browse Source 
fix iPadOS 13 multi-touch issue (#1724)
This commit is contained in:
Ian Gilman 2019-12-13 11:25:27 -08:00 committed by GitHub
commit 72585d9f43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mousetracker.js
View File

@ -2661,7 +2661,7 @@
{ {
eventSource: tracker, eventSource: tracker,
pointerType: curGPoint.type, pointerType: curGPoint.type,
position: getPointRelativeToAbsolute( curGPoint.currentPos, tracker.element ), position: curGPoint.currentPos && getPointRelativeToAbsolute( curGPoint.currentPos, tracker.element ),
buttons: pointsList.buttons, buttons: pointsList.buttons,
pointers: tracker.getActivePointerCount(), pointers: tracker.getActivePointerCount(),
insideElementPressed: updateGPoint ? updateGPoint.insideElementPressed : false, insideElementPressed: updateGPoint ? updateGPoint.insideElementPressed : false,
@ -2958,10 +2958,16 @@
return false; return false;
} }
// OS-specific gestures (e.g. swipe up with four fingers in iPadOS 13)
if (gPoints[ 0 ].type === "touch" && typeof gPoints[ 0 ].currentPos === "undefined") {
abortContacts(tracker, event, pointsList);
return false;
}
for ( i = 0; i < gPointCount; i++ ) { for ( i = 0; i < gPointCount; i++ ) {
curGPoint = gPoints[ i ]; curGPoint = gPoints[ i ];
updateGPoint = pointsList.getById( curGPoint.id ); updateGPoint = pointsList.getById( curGPoint.id );
if ( updateGPoint ) { if ( updateGPoint ) {
// Update the pointer, stop tracking it if not still in this element // Update the pointer, stop tracking it if not still in this element
if ( updateGPoint.captured ) { if ( updateGPoint.captured ) {