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

Workaround for WebKit Pointer Event Implicit Capture Bug #1962

Browse Source
This commit is contained in:
Mark Salsbery 2021-05-03 13:43:47 -07:00
parent 00187cb5a1
commit 4b4da7c4a1
2 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -48,6 +48,7 @@ OPENSEADRAGON CHANGELOG
* Accessibility: we now take the browser's zoom into account when choosing what detail level to draw (#1937 @ronnymikalsen) * Accessibility: we now take the browser's zoom into account when choosing what detail level to draw (#1937 @ronnymikalsen)
* Fixed a bug causing overlays to disappear in Sequence Mode (#1865 @gunmiosb) * Fixed a bug causing overlays to disappear in Sequence Mode (#1865 @gunmiosb)
* Fixed a bug where the ajaxHeaders provided per-image were not being used for image requests (#1968 @maxshuty) * Fixed a bug where the ajaxHeaders provided per-image were not being used for image requests (#1968 @maxshuty)
* MouseTracker: Added workaround for WebKit Pointer Event Implicit Capture Bug
2.4.2: 2.4.2:

48
src/mousetracker.js
View File

@ -1436,6 +1436,7 @@
// Release and remove all gPoints from the pointer list // Release and remove all gPoints from the pointer list
for ( j = 0; j < gPointsToRemove.length; j++ ) { for ( j = 0; j < gPointsToRemove.length; j++ ) {
$.console.log('stopTrackingPointer called from clerTrackedPointers ');
stopTrackingPointer( tracker, pointsList, gPointsToRemove[ j ] ); stopTrackingPointer( tracker, pointsList, gPointsToRemove[ j ] );
} }
} }
@ -2144,7 +2145,7 @@
time = $.now(); time = $.now();
$.console.log('touchstart ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : '')); //$.console.log('touchstart ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
if ( pointsList.getLength() > event.touches.length - touchCount ) { if ( pointsList.getLength() > event.touches.length - touchCount ) {
$.console.warn('Tracked touch contact count doesn\'t match event.touches.length'); $.console.warn('Tracked touch contact count doesn\'t match event.touches.length');
@ -2197,7 +2198,7 @@
time = $.now(); time = $.now();
$.console.log('touchend ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : '')); //$.console.log('touchend ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
var eventInfo = { var eventInfo = {
originalEvent: event, originalEvent: event,
@ -2336,7 +2337,7 @@
* @inner * @inner
*/ */
function onGotPointerCapture( tracker, event ) { function onGotPointerCapture( tracker, event ) {
$.console.log('gotpointercapture ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : '')); //$.console.log('gotpointercapture ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
var eventInfo = { var eventInfo = {
originalEvent: event, originalEvent: event,
@ -2365,7 +2366,7 @@
* @inner * @inner
*/ */
function onLostPointerCapture( tracker, event ) { function onLostPointerCapture( tracker, event ) {
$.console.log('lostpointercapture ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : '')); //$.console.log('lostpointercapture ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
var eventInfo = { var eventInfo = {
originalEvent: event, originalEvent: event,
@ -2545,8 +2546,6 @@
currentTime: $.now() currentTime: $.now()
}; };
var ourElement = event.target === tracker.element;
// Most browsers implicitly capture touch pointer events // Most browsers implicitly capture touch pointer events
// Note no IE versions have element.hasPointerCapture() so no implicit // Note no IE versions have element.hasPointerCapture() so no implicit
// pointer capture possible // pointer capture possible
@ -2558,17 +2557,7 @@
gPoint.type === 'touch' && gPoint.type === 'touch' &&
$.Browser.vendor !== $.BROWSERS.IE; $.Browser.vendor !== $.BROWSERS.IE;
//$.console.log('pointerdown ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (ourElement ? 'tracker.element' : '')); //$.console.log('pointerdown ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
if (implicitlyCaptured) {
$.console.log('pointerdown implicitlyCaptured ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (ourElement ? 'tracker.element' : ''));
} else {
$.console.log('pointerdown not implicitlyCaptured ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (ourElement ? 'tracker.element' : ''));
}
// if ( implicitlyCaptured && ourElement ) {
// updatePointerCaptured( tracker, gPoint, true );
// }
var eventInfo = { var eventInfo = {
originalEvent: event, originalEvent: event,
@ -2588,18 +2577,11 @@
} }
if ( eventInfo.shouldCapture ) { if ( eventInfo.shouldCapture ) {
if ( implicitlyCaptured ) { if ( implicitlyCaptured ) {
$.console.log('pointerdown calling updatePointerCaptured() ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
updatePointerCaptured( tracker, gPoint, true ); updatePointerCaptured( tracker, gPoint, true );
} else { } else {
$.console.log('pointerdown calling capturePointer() ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
capturePointer( tracker, gPoint ); capturePointer( tracker, gPoint );
} }
}// else if ( implicitlyCaptured && ourElement ) { }
// //$.console.log('pointerdown calling releasePointer() ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
// //releasePointer( tracker, gPoint ); //TODO should we do this? Investigate when implementing bubble handling
// $.console.log('pointerdown calling updatePointerCaptured(false) ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
// updatePointerCaptured( tracker, gPoint, false );
// }
} }
@ -2644,8 +2626,7 @@
function handlePointerUp( tracker, event ) { function handlePointerUp( tracker, event ) {
var gPoint; var gPoint;
//$.console.log('onPointerUp ' + (tracker.userData ? tracker.userData.toString() : '')); //$.console.log('pointerup ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
$.console.log('pointerup ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
gPoint = { gPoint = {
id: getPointerId( event ), id: getPointerId( event ),
@ -2677,10 +2658,8 @@
// explicitly // explicitly
if ( eventInfo.shouldReleaseCapture ) { if ( eventInfo.shouldReleaseCapture ) {
if ( event.target === tracker.element ) { if ( event.target === tracker.element ) {
$.console.log('pointerup calling releasePointer() ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
releasePointer( tracker, gPoint ); releasePointer( tracker, gPoint );
} else { } else {
$.console.log('pointerup calling updatePointerCaptured() ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
updatePointerCaptured( tracker, gPoint, false ); updatePointerCaptured( tracker, gPoint, false );
} }
} }
@ -2760,8 +2739,7 @@
* @inner * @inner
*/ */
function onPointerCancel( tracker, event ) { function onPointerCancel( tracker, event ) {
//$.console.log('pointercancel ' + (tracker.userData ? tracker.userData.toString() : '')); //$.console.log('pointercancel ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
$.console.log('pointercancel ' + (tracker.userData ? tracker.userData.toString() : '') + ' ' + (event.target === tracker.element ? 'tracker.element' : ''));
var gPoint = { var gPoint = {
id: event.pointerId, id: event.pointerId,
@ -2832,7 +2810,15 @@
if ( trackedGPoint ) { if ( trackedGPoint ) {
if ( trackedGPoint.captured ) { if ( trackedGPoint.captured ) {
$.console.warn('stopTrackingPointer() called on captured pointer');
releasePointer( tracker, trackedGPoint ); releasePointer( tracker, trackedGPoint );
}
// If child element relinquishes capture to a parent we may get here
// from a pointerleave event while a pointerup event will never be received.
// In that case, we'll clean up the contact count
if ( (pointsList.type === 'mouse' || pointsList.type === 'pen') &&
pointsList.contacts > 0 ) {
pointsList.removeContact(); pointsList.removeContact();
} }