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

Minor naming changes

Browse Source
This commit is contained in:
Mark Salsbery 2014-04-16 06:40:19 -07:00
parent c2e7b376b0
commit 8e119d66e5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mousetracker.js
View File

@ -1985,7 +1985,7 @@
position: getPointRelativeToAbsolute( curGPoint.currentPos, tracker.element ), position: getPointRelativeToAbsolute( curGPoint.currentPos, tracker.element ),
buttons: pointsList.buttons, buttons: pointsList.buttons,
insideElementPressed: curGPoint.insideElementPressed, insideElementPressed: curGPoint.insideElementPressed,
buttonDownAny: pointsList.buttons !== 0,// IS_BUTTON_DOWN, *deprecated* buttonDownAny: pointsList.buttons !== 0,
isTouchEvent: curGPoint.type === 'touch', isTouchEvent: curGPoint.type === 'touch',
originalEvent: event, originalEvent: event,
preventDefaultAction: false, preventDefaultAction: false,
@ -2048,7 +2048,7 @@
position: getPointRelativeToAbsolute( curGPoint.currentPos, tracker.element ), position: getPointRelativeToAbsolute( curGPoint.currentPos, tracker.element ),
buttons: pointsList.buttons, buttons: pointsList.buttons,
insideElementPressed: updateGPoint ? updateGPoint.insideElementPressed : false, insideElementPressed: updateGPoint ? updateGPoint.insideElementPressed : false,
buttonDownAny: pointsList.buttons !== 0,// IS_BUTTON_DOWN, *deprecated* buttonDownAny: pointsList.buttons !== 0,
isTouchEvent: curGPoint.type === 'touch', isTouchEvent: curGPoint.type === 'touch',
originalEvent: event, originalEvent: event,
preventDefaultAction: false, preventDefaultAction: false,

6
test/events.js
View File

@ -409,7 +409,7 @@
} ); } );
// ---------- // ----------
asyncTest( 'MouseTracker: preventDefaultAction', function () { asyncTest( 'Viewer: preventDefaultAction', function () {
var $canvas = $( viewer.element ).find( '.openseadragon-canvas' ).not( '.navigator .openseadragon-canvas' ), var $canvas = $( viewer.element ).find( '.openseadragon-canvas' ).not( '.navigator .openseadragon-canvas' ),
tracker = viewer.innerTracker, tracker = viewer.innerTracker,
origClickHandler, origClickHandler,
@ -642,7 +642,7 @@
} ); } );
// ---------- // ----------
asyncTest( 'Viewer: addHandler without userData', function () { asyncTest( 'EventSource: addHandler without userData', function () {
var openHandler = function ( event ) { var openHandler = function ( event ) {
viewer.removeHandler( 'open', openHandler ); viewer.removeHandler( 'open', openHandler );
ok( event, 'Event handler received event data' ); 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() }, var userData = { item1: 'Test user data', item2: Math.random() },
originalUserData = { item1: userData.item1, item2: userData.item2 }; originalUserData = { item1: userData.item1, item2: userData.item2 };