diff options
| author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-10-05 11:07:10 +0200 |
|---|---|---|
| committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-10-05 11:07:10 +0200 |
| commit | 255bde174cc2e8195c2c43186e40f4abad0c71cc (patch) | |
| tree | ccdde94f1b92afc9606d34a1c2319f08c175fcaf /js/reveal.js | |
| parent | ec76f4790ce5a9c1248bfab9e0d26eb56eccef79 (diff) | |
| parent | 1301de9e396944476fa8e5fd19f4fe5d0fee1dd7 (diff) | |
| download | freenode-live-2017-presentation-255bde174cc2e8195c2c43186e40f4abad0c71cc.tar freenode-live-2017-presentation-255bde174cc2e8195c2c43186e40f4abad0c71cc.tar.gz | |
Merge branch 'r400-linux' of https://github.com/jroper/reveal.js into dev
Diffstat (limited to 'js/reveal.js')
| -rw-r--r-- | js/reveal.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/reveal.js b/js/reveal.js index 2fc2f78..97f2994 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -4011,8 +4011,8 @@ // keyboard modifier key is present if( activeElementIsCE || activeElementIsInput || activeElementIsNotes || (event.shiftKey && event.keyCode !== 32) || event.altKey || event.ctrlKey || event.metaKey ) return; - // While paused only allow resume keyboard events; 'b', '.'' - var resumeKeyCodes = [66,190,191]; + // While paused only allow resume keyboard events; 'b', 'v', '.' + var resumeKeyCodes = [66,86,190,191]; var key; // Custom key bindings for togglePause should be able to resume @@ -4084,8 +4084,8 @@ case 32: isOverview() ? deactivateOverview() : event.shiftKey ? navigatePrev() : navigateNext(); break; // return case 13: isOverview() ? deactivateOverview() : triggered = false; break; - // two-spot, semicolon, b, period, Logitech presenter tools "black screen" button - case 58: case 59: case 66: case 190: case 191: togglePause(); break; + // two-spot, semicolon, b, v, period, Logitech presenter tools "black screen" button + case 58: case 59: case 66: case 86: case 190: case 191: togglePause(); break; // f case 70: enterFullscreen(); break; // a |