Merge branch 'feature_prevent_swipe' of https://github.com/Calyhre/reveal.js into dev
This commit is contained in:
commit
be7545da1a
1 changed files with 13 additions and 0 deletions
13
js/reveal.js
13
js/reveal.js
|
@ -3954,6 +3954,8 @@
|
|||
*/
|
||||
function onTouchStart( event ) {
|
||||
|
||||
if(preventSwipe(event.target)) return true;
|
||||
|
||||
touch.startX = event.touches[0].clientX;
|
||||
touch.startY = event.touches[0].clientY;
|
||||
touch.startCount = event.touches.length;
|
||||
|
@ -3977,6 +3979,8 @@
|
|||
*/
|
||||
function onTouchMove( event ) {
|
||||
|
||||
if(preventSwipe(event.target)) return true;
|
||||
|
||||
// Each touch should only trigger one action
|
||||
if( !touch.captured ) {
|
||||
onUserInput( event );
|
||||
|
@ -4267,6 +4271,15 @@
|
|||
|
||||
}
|
||||
|
||||
function preventSwipe(target) {
|
||||
while( target && typeof target.hasAttribute === 'function' ) {
|
||||
if(target.hasAttribute('prevent-swipe')) return true;
|
||||
target = target.parentNode;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// --------------------------------------------------------------------//
|
||||
// ------------------------ PLAYBACK COMPONENT ------------------------//
|
||||
|
|
Loading…
Reference in a new issue