From 0d37757f3f34dff5840eff6bd5ac6735938234a6 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Thu, 10 Sep 2015 11:25:19 +0200 Subject: [PATCH] modifications to #951 --- js/reveal.js | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/js/reveal.js b/js/reveal.js index b1a20ccd..29c2df09 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -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 ------------------------//