Merge pull request #2114 from ChumpChief/standardized-pointer
Prefer W3C pointer events and updates to match the standard definition
This commit is contained in:
commit
3bbf969686
36
js/reveal.js
36
js/reveal.js
|
@ -1176,13 +1176,8 @@
|
|||
window.addEventListener( 'resize', onWindowResize, false );
|
||||
|
||||
if( config.touch ) {
|
||||
dom.wrapper.addEventListener( 'touchstart', onTouchStart, false );
|
||||
dom.wrapper.addEventListener( 'touchmove', onTouchMove, false );
|
||||
dom.wrapper.addEventListener( 'touchend', onTouchEnd, false );
|
||||
|
||||
// Support pointer-style touch interaction as well
|
||||
if( window.navigator.pointerEnabled ) {
|
||||
// IE 11 uses un-prefixed version of pointer events
|
||||
if('onpointerdown' in window) {
|
||||
// Use W3C pointer events
|
||||
dom.wrapper.addEventListener( 'pointerdown', onPointerDown, false );
|
||||
dom.wrapper.addEventListener( 'pointermove', onPointerMove, false );
|
||||
dom.wrapper.addEventListener( 'pointerup', onPointerUp, false );
|
||||
|
@ -1193,6 +1188,12 @@
|
|||
dom.wrapper.addEventListener( 'MSPointerMove', onPointerMove, false );
|
||||
dom.wrapper.addEventListener( 'MSPointerUp', onPointerUp, false );
|
||||
}
|
||||
else {
|
||||
// Fall back to touch events
|
||||
dom.wrapper.addEventListener( 'touchstart', onTouchStart, false );
|
||||
dom.wrapper.addEventListener( 'touchmove', onTouchMove, false );
|
||||
dom.wrapper.addEventListener( 'touchend', onTouchEnd, false );
|
||||
}
|
||||
}
|
||||
|
||||
if( config.keyboard ) {
|
||||
|
@ -1254,24 +1255,19 @@
|
|||
document.removeEventListener( 'keypress', onDocumentKeyPress, false );
|
||||
window.removeEventListener( 'hashchange', onWindowHashChange, false );
|
||||
window.removeEventListener( 'resize', onWindowResize, false );
|
||||
|
||||
dom.wrapper.removeEventListener( 'pointerdown', onPointerDown, false );
|
||||
dom.wrapper.removeEventListener( 'pointermove', onPointerMove, false );
|
||||
dom.wrapper.removeEventListener( 'pointerup', onPointerUp, false );
|
||||
|
||||
dom.wrapper.removeEventListener( 'MSPointerDown', onPointerDown, false );
|
||||
dom.wrapper.removeEventListener( 'MSPointerMove', onPointerMove, false );
|
||||
dom.wrapper.removeEventListener( 'MSPointerUp', onPointerUp, false );
|
||||
|
||||
dom.wrapper.removeEventListener( 'touchstart', onTouchStart, false );
|
||||
dom.wrapper.removeEventListener( 'touchmove', onTouchMove, false );
|
||||
dom.wrapper.removeEventListener( 'touchend', onTouchEnd, false );
|
||||
|
||||
// IE11
|
||||
if( window.navigator.pointerEnabled ) {
|
||||
dom.wrapper.removeEventListener( 'pointerdown', onPointerDown, false );
|
||||
dom.wrapper.removeEventListener( 'pointermove', onPointerMove, false );
|
||||
dom.wrapper.removeEventListener( 'pointerup', onPointerUp, false );
|
||||
}
|
||||
// IE10
|
||||
else if( window.navigator.msPointerEnabled ) {
|
||||
dom.wrapper.removeEventListener( 'MSPointerDown', onPointerDown, false );
|
||||
dom.wrapper.removeEventListener( 'MSPointerMove', onPointerMove, false );
|
||||
dom.wrapper.removeEventListener( 'MSPointerUp', onPointerUp, false );
|
||||
}
|
||||
|
||||
if ( config.progress && dom.progress ) {
|
||||
dom.progress.removeEventListener( 'click', onProgressClicked, false );
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue