Merge branch 'r400-linux' of https://github.com/jroper/reveal.js into dev

edit
Hakim El Hattab 2016-10-05 11:07:10 +02:00
commit 255bde174c
1 changed files with 4 additions and 4 deletions

View File

@ -4011,8 +4011,8 @@
// keyboard modifier key is present // keyboard modifier key is present
if( activeElementIsCE || activeElementIsInput || activeElementIsNotes || (event.shiftKey && event.keyCode !== 32) || event.altKey || event.ctrlKey || event.metaKey ) return; if( activeElementIsCE || activeElementIsInput || activeElementIsNotes || (event.shiftKey && event.keyCode !== 32) || event.altKey || event.ctrlKey || event.metaKey ) return;
// While paused only allow resume keyboard events; 'b', '.'' // While paused only allow resume keyboard events; 'b', 'v', '.'
var resumeKeyCodes = [66,190,191]; var resumeKeyCodes = [66,86,190,191];
var key; var key;
// Custom key bindings for togglePause should be able to resume // Custom key bindings for togglePause should be able to resume
@ -4084,8 +4084,8 @@
case 32: isOverview() ? deactivateOverview() : event.shiftKey ? navigatePrev() : navigateNext(); break; case 32: isOverview() ? deactivateOverview() : event.shiftKey ? navigatePrev() : navigateNext(); break;
// return // return
case 13: isOverview() ? deactivateOverview() : triggered = false; break; case 13: isOverview() ? deactivateOverview() : triggered = false; break;
// two-spot, semicolon, b, period, Logitech presenter tools "black screen" button // two-spot, semicolon, b, v, period, Logitech presenter tools "black screen" button
case 58: case 59: case 66: case 190: case 191: togglePause(); break; case 58: case 59: case 66: case 86: case 190: case 191: togglePause(); break;
// f // f
case 70: enterFullscreen(); break; case 70: enterFullscreen(); break;
// a // a