Merge branch 'main' into refactor/byline

# Conflicts:
#	main.js
This commit is contained in:
quenousimporte 2023-10-19 09:14:19 +02:00
commit 3eff6a48af
1 changed files with 2 additions and 2 deletions

View File

@ -120,7 +120,6 @@ var commands = [
allowunsaved: true allowunsaved: true
}, },
{ {
shortcut: "F1",
hint: "Show help", hint: "Show help",
action: showhelp action: showhelp
}, },
@ -2496,9 +2495,10 @@ function mainkeydownhandler()
fileindex = Math.max(fileindex, 0); fileindex = Math.max(fileindex, 0);
applyfileindex(); applyfileindex();
} }
else if (event.ctrlKey && event.key == " " || event.key == "F2") else if (event.ctrlKey && event.key == " " || event.key == "F1")
{ {
commandpalette(); commandpalette();
event.preventDefault();
} }
else if (event.ctrlKey && event.shiftKey && (event.keyCode == "40" || event.keyCode == "38")) else if (event.ctrlKey && event.shiftKey && (event.keyCode == "40" || event.keyCode == "38"))
{ {