diff --git a/src/mousetracker.js b/src/mousetracker.js index 1d605bb8..4405e93e 100644 --- a/src/mousetracker.js +++ b/src/mousetracker.js @@ -1985,7 +1985,7 @@ position: getPointRelativeToAbsolute( curGPoint.currentPos, tracker.element ), buttons: pointsList.buttons, insideElementPressed: curGPoint.insideElementPressed, - buttonDownAny: pointsList.buttons !== 0,// IS_BUTTON_DOWN, *deprecated* + buttonDownAny: pointsList.buttons !== 0, isTouchEvent: curGPoint.type === 'touch', originalEvent: event, preventDefaultAction: false, @@ -2048,7 +2048,7 @@ position: getPointRelativeToAbsolute( curGPoint.currentPos, tracker.element ), buttons: pointsList.buttons, insideElementPressed: updateGPoint ? updateGPoint.insideElementPressed : false, - buttonDownAny: pointsList.buttons !== 0,// IS_BUTTON_DOWN, *deprecated* + buttonDownAny: pointsList.buttons !== 0, isTouchEvent: curGPoint.type === 'touch', originalEvent: event, preventDefaultAction: false, diff --git a/test/events.js b/test/events.js index d56fbf44..61137046 100644 --- a/test/events.js +++ b/test/events.js @@ -409,7 +409,7 @@ } ); // ---------- - asyncTest( 'MouseTracker: preventDefaultAction', function () { + asyncTest( 'Viewer: preventDefaultAction', function () { var $canvas = $( viewer.element ).find( '.openseadragon-canvas' ).not( '.navigator .openseadragon-canvas' ), tracker = viewer.innerTracker, origClickHandler, @@ -642,7 +642,7 @@ } ); // ---------- - asyncTest( 'Viewer: addHandler without userData', function () { + asyncTest( 'EventSource: addHandler without userData', function () { var openHandler = function ( event ) { viewer.removeHandler( 'open', openHandler ); ok( event, 'Event handler received event data' ); @@ -659,7 +659,7 @@ } ); // ---------- - asyncTest( 'Viewer: addHandler with userData', function () { + asyncTest( 'EventSource: addHandler with userData', function () { var userData = { item1: 'Test user data', item2: Math.random() }, originalUserData = { item1: userData.item1, item2: userData.item2 };