xobs/fossasia-22-renode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature_prevent_swipe' of https://github.com/Calyhre/reveal.js into dev

Browse Source
This commit is contained in:
Hakim El Hattab
2015-09-10 11:10:08 +02:00
parent bd6a592b8b ed8d90bc58
commit be7545da1a
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
js/reveal.js
View File

@@ -3954,6 +3954,8 @@
*/ */
function onTouchStart( event ) { function onTouchStart( event ) {
if(preventSwipe(event.target)) return true;
touch.startX = event.touches[0].clientX; touch.startX = event.touches[0].clientX;
touch.startY = event.touches[0].clientY; touch.startY = event.touches[0].clientY;
touch.startCount = event.touches.length; touch.startCount = event.touches.length;
@@ -3977,6 +3979,8 @@
*/ */
function onTouchMove( event ) { function onTouchMove( event ) {
if(preventSwipe(event.target)) return true;
// Each touch should only trigger one action // Each touch should only trigger one action
if( !touch.captured ) { if( !touch.captured ) {
onUserInput( event ); 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 ------------------------// // ------------------------ PLAYBACK COMPONENT ------------------------//