Merge pull request #2326 from earboxer/2313-navigation-mode-shortcuts-table

Allow Navigation Mode setting to change the shortcuts table

js/reveal.js

@@ -374,20 +374,8 @@
 			threshold: 40
 		},
 
-		// Holds information about the keyboard shortcuts
-		keyboardShortcuts = {
-			'N  ,  SPACE':						'Next slide',
-			'P':								'Previous slide',
-			'←  ,  H':					'Navigate left',
-			'→  ,  L':					'Navigate right',
-			'↑  ,  K':					'Navigate up',
-			'↓  ,  J':					'Navigate down',
-			'Home  ,  ⌘/CTRL ←':	'First slide',
-			'End  ,  ⌘/CTRL →':		'Last slide',
-			'B  ,  .':							'Pause',
-			'F':								'Fullscreen',
-			'ESC, O':							'Slide overview'
-		},
+		// Holds information about the keyboard shortcuts (filled in on configuration).
+		keyboardShortcuts = {},
 
 		// Holds custom key code mappings
 		registeredKeyBindings = {};
@@ -1444,6 +1432,25 @@
 			dom.wrapper.removeAttribute( 'data-navigation-mode' );
 		}
 
+
+		if( config.navigationMode === 'linear' ) {
+			keyboardShortcuts['N  ,  SPACE  ,  →  ,  L  ,  ↓  ,  J'] = 'Next slide';
+			keyboardShortcuts['P  ,  ←  ,  H  ,  ↑  ,  K'] =           'Previous slide';
+		}
+		else {
+			keyboardShortcuts['N  ,  SPACE'] =   'Next slide';
+			keyboardShortcuts['P'] =             'Previous slide';
+			keyboardShortcuts['←  ,  H'] = 'Navigate left';
+			keyboardShortcuts['→  ,  L'] = 'Navigate right';
+			keyboardShortcuts['↑  ,  K'] = 'Navigate up';
+			keyboardShortcuts['↓  ,  J'] = 'Navigate down';
+		}
+		keyboardShortcuts['Home  ,  ⌘/CTRL ←'] = 'First slide';
+		keyboardShortcuts['End  ,  ⌘/CTRL →'] =  'Last slide';
+		keyboardShortcuts['B  ,  .'] =                       'Pause';
+		keyboardShortcuts['F'] =                             'Fullscreen';
+		keyboardShortcuts['ESC, O'] =                        'Slide overview';
+
 		sync();
 
 	}