mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-16 14:53:14 +03:00
Code Issues Projects Releases Wiki Activity

Better setPointerCapture/releasePointerCapture exception handling

Browse Source
This commit is contained in:
Mark Salsbery 2020-08-25 09:11:00 -07:00
parent 5360e65ee9
commit 35b1dcf362
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mousetracker.js
View File

@ -1621,7 +1621,7 @@
if ( $.MouseTracker.havePointerCapture ) { if ( $.MouseTracker.havePointerCapture ) {
if ( $.MouseTracker.havePointerEvents ) { if ( $.MouseTracker.havePointerEvents ) {
// Can throw InvalidPointerId // Can throw InvalidPointerId
// (should never happen for setPointerCapture so we'll log a warning) // (should never happen so we'll log a warning)
try { try {
if ( $.MouseTracker.unprefixedPointerEvents ) { if ( $.MouseTracker.unprefixedPointerEvents ) {
tracker.element.setPointerCapture( gPoint.id ); tracker.element.setPointerCapture( gPoint.id );
@ -1677,12 +1677,18 @@
*/ */
function releasePointer( tracker, gPoint ) { function releasePointer( tracker, gPoint ) {
var eventParams; var eventParams;
var pointsList;
var cachedGPoint;
if ( $.MouseTracker.havePointerCapture ) { if ( $.MouseTracker.havePointerCapture ) {
if ( $.MouseTracker.havePointerEvents ) { if ( $.MouseTracker.havePointerEvents ) {
pointsList = tracker.getActivePointersListByType( gPoint.type );
cachedGPoint = pointsList.getById( gPoint.id );
if ( !cachedGPoint || !cachedGPoint.captured ) {
return;
}
// Can throw InvalidPointerId // Can throw InvalidPointerId
// (can happen depending on browser event timing (Firefox touch) // (should never happen so we'll log a warning)
// so we won't log a warning)
try { try {
if ( $.MouseTracker.unprefixedPointerEvents ) { if ( $.MouseTracker.unprefixedPointerEvents ) {
tracker.element.releasePointerCapture( gPoint.id ); tracker.element.releasePointerCapture( gPoint.id );
@ -1692,7 +1698,7 @@
//$.console.log('element.msReleasePointerCapture() called'); //$.console.log('element.msReleasePointerCapture() called');
} }
} catch ( e ) { } catch ( e ) {
/* eslint-disable no-empty */ $.console.warn('releasePointerCapture() called on invalid pointer ID');
} }
} else { } else {
tracker.element.releaseCapture(); tracker.element.releaseCapture();