aboutsummaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorHakim El Hattab <hakim.elhattab@gmail.com>2015-11-09 16:47:21 +0100
committerHakim El Hattab <hakim.elhattab@gmail.com>2015-11-09 16:47:21 +0100
commita5181e4372a081a266e94d912b6eada1923e7b44 (patch)
tree50f0c24b19334389da4ae656e9ea19dcc5c0c0ab /plugin
parent50f9896362e373375d05eb3278ccab983849d3d9 (diff)
parentdd8f95d9a9aa0167defe3388f0097e899a2a8b23 (diff)
downloadfreenode-live-2017-presentation-a5181e4372a081a266e94d912b6eada1923e7b44.tar
freenode-live-2017-presentation-a5181e4372a081a266e94d912b6eada1923e7b44.tar.gz
Merge pull request #1391 from rohithpr/notes-key-binding
Fixed #1379 - config keyboard now disables 's' key
Diffstat (limited to 'plugin')
-rw-r--r--plugin/notes/notes.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugin/notes/notes.js b/plugin/notes/notes.js
index a0e8021..202e73b 100644
--- a/plugin/notes/notes.js
+++ b/plugin/notes/notes.js
@@ -111,6 +111,9 @@ var RevealNotes = (function() {
// modifier is present
if ( document.querySelector( ':focus' ) !== null || event.shiftKey || event.altKey || event.ctrlKey || event.metaKey ) return;
+ // Disregard the event if keyboard is disabled
+ if ( Reveal.getConfig().keyboard === false ) return;
+
if( event.keyCode === 83 ) {
event.preventDefault();
openNotes();