xobs/fa20-bt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge #959 with minor tweaks

Browse Source
This commit is contained in:
Hakim El Hattab
2015-06-03 11:59:00 +02:00
parent f0cf1f54d0 a078c87f10
commit db359519ae
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/reveal.js
View File

@@ -3764,8 +3764,15 @@
// keyboard modifier key is present // keyboard modifier key is present
if( activeElementIsCE || activeElementIsInput || (event.shiftKey && event.keyCode !== 32) || event.altKey || event.ctrlKey || event.metaKey ) return; if( activeElementIsCE || activeElementIsInput || (event.shiftKey && event.keyCode !== 32) || event.altKey || event.ctrlKey || event.metaKey ) return;
// While paused only allow "unpausing" keyboard events (b and .) // While paused only allow resume keyboard events;
if( isPaused() && [66,190,191].indexOf( event.keyCode ) === -1 ) { // '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; return false;
} }