Skip to content

Commit 34285ab

Browse files
committed
Check whether blockly shortcuts exist before deregistering
Avoid debug warning output
1 parent 4dd0044 commit 34285ab

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

main/blocklyinit.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,8 +640,11 @@ export function createBlocklyWorkspace() {
640640
// Initialize keyboard navigation.
641641

642642
const shortcutRegistry = Blockly.ShortcutRegistry.registry;
643-
shortcutRegistry.removeAllKeyMappings?.("menu");
644-
shortcutRegistry.unregister?.("menu");
643+
const keyboardShortcuts = shortcutRegistry.getRegistry?.();
644+
if (keyboardShortcuts?.menu) {
645+
shortcutRegistry.removeAllKeyMappings?.("menu");
646+
shortcutRegistry.unregister?.("menu");
647+
}
645648
new KeyboardNavigation(workspace);
646649

647650
const toolbox = workspace.getToolbox();

main/main.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,10 @@ function registerBlocklyPlayShortcut() {
134134
null,
135135
);
136136

137-
shortcutRegistry.unregister(shortcutName);
137+
const keyboardShortcuts = shortcutRegistry.getRegistry?.();
138+
if (keyboardShortcuts?.[shortcutName]) {
139+
shortcutRegistry.unregister(shortcutName);
140+
}
138141
shortcutRegistry.register({
139142
name: shortcutName,
140143
keyCodes: [keyCode],

0 commit comments

Comments
 (0)