mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-01-31 23:21:42 +03:00
Code Issues Projects Releases Wiki Activity

MouseTracker Original Events in Handlers

Browse Source 
Pass original touch events to handlers.
This commit is contained in:
Mark Salsbery 2013-09-06 13:12:11 -07:00
parent 2e1f71a824
commit d60224b615
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/mousetracker.js
View File

@ -841,10 +841,10 @@
event.changedTouches.length == 1 ) { event.changedTouches.length == 1 ) {
THIS[tracker.hash].lastTouch = event.touches[0]; THIS[tracker.hash].lastTouch = event.touches[0];
onMouseOver( tracker, event.changedTouches[0], true ); onMouseOver( tracker, event, true );
// call with no capture as the onMouseMoveWindow will // call with no capture as the onMouseMoveWindow will
// be triggered by onTouchMove // be triggered by onTouchMove
onMouseDown( tracker, event.touches[0], true, true ); onMouseDown( tracker, event, true, true );
} }
if ( event.touches.length == 2 ) { if ( event.touches.length == 2 ) {
@ -924,8 +924,8 @@
// call with no release, as the mouse events are // call with no release, as the mouse events are
// not registered in onTouchStart // not registered in onTouchStart
onMouseUpWindow( tracker, event.changedTouches[0], true ); onMouseUpWindow( tracker, event, true, true );
onMouseOut( tracker, event.changedTouches[0], true ); onMouseOut( tracker, event, true );
} }
if ( event.touches.length + event.changedTouches.length == 2 ) { if ( event.touches.length + event.changedTouches.length == 2 ) {
THIS[tracker.hash].lastPinchDelta = null; THIS[tracker.hash].lastPinchDelta = null;
@ -983,9 +983,11 @@
* @private * @private
* @inner * @inner
*/ */
function onMouseUpWindow( tracker, event, noRelease ) { function onMouseUpWindow( tracker, event, noRelease, isTouch ) {
isTouch = ( isTouch !== undefined ) ? isTouch : false;
if ( !THIS[tracker.hash].insideElement ) { if ( !THIS[tracker.hash].insideElement ) {
onMouseUp( tracker, event, false ); onMouseUp( tracker, event, isTouch );
} }
if ( noRelease ) { if ( noRelease ) {
@ -1171,7 +1173,7 @@
event.changedTouches.length === 1 && event.changedTouches.length === 1 &&
THIS[tracker.hash].lastTouch.identifier === event.touches[0].identifier ) { THIS[tracker.hash].lastTouch.identifier === event.touches[0].identifier ) {
onMouseMoveWindow( tracker, event.touches[0], true ); onMouseMoveWindow( tracker, event, true );
} else if ( event.touches.length === 2 ) { } else if ( event.touches.length === 2 ) {
@ -1185,15 +1187,14 @@
if ( Math.abs( THIS[tracker.hash].lastPinchDelta - pinchDelta ) > 75 ) { if ( Math.abs( THIS[tracker.hash].lastPinchDelta - pinchDelta ) > 75 ) {
//$.console.debug( "pinch delta : " + pinchDelta + " | previous : " + THIS[ tracker.hash ].lastPinchDelta); //$.console.debug( "pinch delta : " + pinchDelta + " | previous : " + THIS[ tracker.hash ].lastPinchDelta);
onMouseWheelSpin( tracker, { // Adjust the original event enough to simulate a mouse wheel scroll
shift: false, event.shift = false;
shiftKey: false, event.shiftKey = false;
pageX: THIS[tracker.hash].pinchMidpoint.x, event.pageX = THIS[tracker.hash].pinchMidpoint.x;
pageY: THIS[tracker.hash].pinchMidpoint.y, event.pageY = THIS[tracker.hash].pinchMidpoint.y;
detail: ( event.detail = ( THIS[tracker.hash].lastPinchDelta > pinchDelta ) ? 1 : -1;
THIS[tracker.hash].lastPinchDelta > pinchDelta
) ? 1 : -1 onMouseWheelSpin( tracker, event, true );
}, true );
THIS[tracker.hash].lastPinchDelta = pinchDelta; THIS[tracker.hash].lastPinchDelta = pinchDelta;
} }