replace event.keyCode with event.code

impress · Mar 5, 2023 · 4efdf40 · 4efdf40
1 parent bb37a47
commit 4efdf40
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/plugins/blackout/blackout.js b/src/plugins/blackout/blackout.js
@@ -92,7 +92,7 @@
         gc.addEventListener( document, "keydown", function( event ) {
 
             // Accept b or . -> . is sent by presentation remote controllers
-            if ( [ "KeyB", "Period" ].includes(event.key) {
+            if ( [ "KeyB", "Period" ].includes(event.code) ) {
                 event.preventDefault();
                 if ( !blackedOut ) {
                     blackout();
@@ -105,7 +105,7 @@
         gc.addEventListener( document, "keyup", function( event ) {
 
             // Accept b or . -> . is sent by presentation remote controllers
-            if ( [ "KeyB", "Period" ].includes(event.key) {
+            if ( [ "KeyB", "Period" ].includes(event.code) ) {
                 event.preventDefault();
             }
         }, false );

diff --git a/src/plugins/goto/goto.js b/src/plugins/goto/goto.js
@@ -65,7 +65,7 @@
 
                 // Don't return, allow the other categories to work despite this error
             } else {
-                var index = keylist.indexOf( event.origEvent.key );
+                var index = keylist.indexOf( event.origEvent.code );
                 if ( index >= 0 ) {
                     var next = nextlist[ index ];
                     if ( isNumber( next ) ) {

diff --git a/src/plugins/help/help.js b/src/plugins/help/help.js
@@ -59,7 +59,7 @@
     document.addEventListener( "keyup", function( event ) {
 
 	// "h" || "?" -- but this seems brittle, what about keyboards that don't have / ? together?
-        if ( [ "KeyH", "Slash" ].includes(event.key) ) {
+        if ( [ "KeyH", "Slash" ].includes(event.code) ) {
             event.preventDefault();
             toggleHelp();
         }

diff --git a/src/plugins/impressConsole/impressConsole.js b/src/plugins/impressConsole/impressConsole.js
@@ -322,15 +322,15 @@
             // Prevent default keydown action when one of supported key is pressed
             window.document.addEventListener( 'keydown', function( event ) {
                 if ( !event.ctrlKey && !event.altKey && !event.shiftKey && !event.metaKey &&
-                     keys.includes( event.key ) ) {
+                     keys.includes( event.code ) ) {
                     event.preventDefault();
                 }
             }, false );
 
             // Trigger impress action on keyup
             window.document.addEventListener( 'keyup', function( event ) {
                 if ( !event.ctrlKey && !event.altKey && !event.shiftKey && !event.metaKey &&
-                     keys.includes( event.key) ) {
+                     keys.includes( event.code) ) {
                         handler();
                         event.preventDefault();
                 }

diff --git a/src/plugins/navigation/navigation.js b/src/plugins/navigation/navigation.js
@@ -58,7 +58,7 @@
 
             // In the case of TAB, we force step navigation always, overriding the browser
             // navigation between input elements, buttons and links.
-            if ( event.key === "Tab" ) {
+            if ( event.code === "Tab" ) {
                 return true;
             }
 
@@ -68,7 +68,7 @@
             }
 
             if ( "Space PageUp PageDown ArrowLeft ArrowRight ArrowUp ArrowDown"
-		 .split(" ").includes(event.key) ) {
+		 .split(" ").includes(event.code) ) {
                 return true;
             }
         };
@@ -86,13 +86,13 @@
         gc.addEventListener( document, "keyup", function( event ) {
             if ( isNavigationEvent( event ) ) {
                 if ( event.shiftKey ) {
-                    switch ( event.key ) {
+                    switch ( event.code ) {
                         case "Tab": // Shift+tab
                             api.prev();
                             break;
                     }
                 } else {
-                    switch ( event.key ) {
+                    switch ( event.code ) {
                     case "PageUp":
                     case "ArrowLeft":
                     case "ArrowUp": api.prev( event ); break;