blallo/talk-hm-0x15
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

modifications to #951

Browse source
This commit is contained in:
Hakim El Hattab 2015-09-10 11:25:19 +02:00
parent be7545da1a
commit 0d37757f3f
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
js/reveal.js
View file

@ -3781,6 +3781,21 @@
}
/**
* Checks if the target element prevents the triggering of
* swipe navigation.
*/
function isSwipePrevented( target ) {
while( target && typeof target.hasAttribute === 'function' ) {
if( target.hasAttribute( 'data-prevent-swipe' ) ) return true;
target = target.parentNode;
}
return false;
}
// --------------------------------------------------------------------//
// ----------------------------- EVENTS -------------------------------//
@ -3954,7 +3969,7 @@
*/
function onTouchStart( event ) {
if(preventSwipe(event.target)) return true;
if( isSwipePrevented( event.target ) ) return true;
touch.startX = event.touches[0].clientX;
touch.startY = event.touches[0].clientY;
@ -3979,7 +3994,7 @@
*/
function onTouchMove( event ) {
if(preventSwipe(event.target)) return true;
if( isSwipePrevented( event.target ) ) return true;
// Each touch should only trigger one action
if( !touch.captured ) {
@ -4271,15 +4286,6 @@
}
function preventSwipe(target) {
while( target && typeof target.hasAttribute === 'function' ) {
if(target.hasAttribute('prevent-swipe')) return true;
target = target.parentNode;
}
return false;
}
// --------------------------------------------------------------------//
// ------------------------ PLAYBACK COMPONENT ------------------------//