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

Merge pull request #168 from ethanli83/fixtouch

Browse Source 
canvas pans when tap on touch screen
This commit is contained in:
iangilman 2013-07-31 10:25:19 -07:00
commit 0aa0641cf4
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mousetracker.js
View File

@ -663,7 +663,7 @@
* @private * @private
* @inner * @inner
*/ */
function onMouseDown( tracker, event ) { function onMouseDown( tracker, event, noCapture ) {
var delegate = THIS[ tracker.hash ], var delegate = THIS[ tracker.hash ],
propagate; propagate;
@ -693,6 +693,10 @@
$.cancelEvent( event ); $.cancelEvent( event );
} }
if ( noCapture ) {
return;
}
if ( !( $.Browser.vendor == $.BROWSERS.IE && $.Browser.version < 9 ) || if ( !( $.Browser.vendor == $.BROWSERS.IE && $.Browser.version < 9 ) ||
!IS_CAPTURING ) { !IS_CAPTURING ) {
captureMouse( tracker ); captureMouse( tracker );
@ -719,7 +723,9 @@
THIS[ tracker.hash ].lastTouch = event.touches[ 0 ]; THIS[ tracker.hash ].lastTouch = event.touches[ 0 ];
onMouseOver( tracker, event.changedTouches[ 0 ] ); onMouseOver( tracker, event.changedTouches[ 0 ] );
onMouseDown( tracker, event.touches[ 0 ] ); // call with no capture as the onMouseMove will
// be triggered by onTouchMove
onMouseDown( tracker, event.touches[ 0 ], true );
} }
if( event.touches.length == 2 ){ if( event.touches.length == 2 ){
@ -790,7 +796,9 @@
THIS[ tracker.hash ].lastTouch = null; THIS[ tracker.hash ].lastTouch = null;
onMouseUpWindow( tracker, event.changedTouches[ 0 ] ); // call with no release, as the mouse events are
// not registered in onTouchStart
onMouseUpWindow( tracker, event.changedTouches[ 0 ], true );
onMouseOut( tracker, event.changedTouches[ 0 ] ); onMouseOut( tracker, event.changedTouches[ 0 ] );
} }
if( event.touches.length + event.changedTouches.length == 2 ){ if( event.touches.length + event.changedTouches.length == 2 ){
@ -849,10 +857,15 @@
* @private * @private
* @inner * @inner
*/ */
function onMouseUpWindow( tracker, event ) { function onMouseUpWindow( tracker, event, noRelease ) {
if ( ! THIS[ tracker.hash ].insideElement ) { if ( ! THIS[ tracker.hash ].insideElement ) {
onMouseUp( tracker, event ); onMouseUp( tracker, event );
} }
if (noRelease) {
return;
}
releaseMouse( tracker ); releaseMouse( tracker );
} }