Merge branch '2380-linear-navigation-mobile' of https://github.com/earboxer/reveal.js into dev

1 files changed, 39 insertions, 4 deletions

diff --git a/js/reveal.js b/js/reveal.js
index 0065e9b..a449e75 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -3951,6 +3951,11 @@
 			}
 		}
 
+		if( config.navigationMode === 'linear' ) {
+			routes.right = routes.right || routes.down;
+			routes.left = routes.left || routes.up;
+		}
+
 		// Reverse horizontal controls for rtl
 		if( config.rtl ) {
 			var left = routes.left;
@@ -5436,19 +5441,49 @@
 
 				if( deltaX > touch.threshold && Math.abs( deltaX ) > Math.abs( deltaY ) ) {
 					touch.captured = true;
-					navigateLeft();
+					if (config.navigationMode === 'linear') {
+						if( config.rtl ) {
+							navigateNext();
+						}
+						else {
+							navigatePrev();
+						}
+					}
+					else {
+						navigateLeft();
+					}
 				}
 				else if( deltaX < -touch.threshold && Math.abs( deltaX ) > Math.abs( deltaY ) ) {
 					touch.captured = true;
-					navigateRight();
+					if (config.navigationMode === 'linear') {
+						if( config.rtl ) {
+							navigatePrev();
+						}
+						else {
+							navigateNext();
+						}
+					}
+					else {
+						navigateRight();
+					}
 				}
 				else if( deltaY > touch.threshold ) {
 					touch.captured = true;
-					navigateUp();
+					if (config.navigationMode === 'linear') {
+						navigatePrev();
+					}
+					else {
+						navigateUp();
+					}
 				}
 				else if( deltaY < -touch.threshold ) {
 					touch.captured = true;
-					navigateDown();
+					if (config.navigationMode === 'linear') {
+						navigateNext();
+					}
+					else {
+						navigateDown();
+					}
 				}
 
 				// If we're embedded, only block touch events if they have