Merge branch 'davidbanham-master' into dev

1 files changed, 9 insertions, 2 deletions

diff --git a/js/reveal.js b/js/reveal.js
index ff5ea53..556f222 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -3764,8 +3764,15 @@
 		// keyboard modifier key is present
 		if( activeElementIsCE || activeElementIsInput || (event.shiftKey && event.keyCode !== 32) || event.altKey || event.ctrlKey || event.metaKey ) return;
 
-		// While paused only allow "unpausing" keyboard events (b and .)
-		if( isPaused() && [66,190,191].indexOf( event.keyCode ) === -1 ) {
+		// While paused only allow resume keyboard events;
+		// 'b', '.' or any key specifically mapped to togglePause
+		var resumeKeyCodes = [66,190,191].concat( Object.keys( config.keyboard ).map( function( key ) {
+			if( config.keyboard[key] === 'togglePause' ) {
+				return parseInt( key, 10 );
+			}
+		}));
+
+		if( isPaused() && resumeKeyCodes.indexOf( event.keyCode ) === -1 ) {
 			return false;
 		}