Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #2701: Do not show shortcut box when modifier key is pressed #2721

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Fix #2701: Do not show shortcut box when modifier key is pressed #2721

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56329f0
Fix #2701: Do not show shortcut box when modifier key is pressed
mpsijm Sep 25, 2024
d0a14d8
Keyboard shortcuts: also remove box before redirect when pressing Ent…
mpsijm Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 30 additions & 24 deletions webapp/public/js/domjudge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,10 @@ function initializeKeyboardShortcuts() {
if (keysCookie != 1 && keysCookie != "") {
return;
}
// Do not trigger shortcuts if user is pressing Ctrl/Alt/Option/Meta key.
if (e.altKey || e.ctrlKey || e.metaKey) {
return;
}
// Check if the user is not typing in an input field.
if (e.target.tagName === 'INPUT' || e.target.tagName === 'TEXTAREA') {
return;
Expand Down Expand Up @@ -901,38 +905,40 @@ function initializeKeyboardShortcuts() {
if (e.key >= '0' && e.key <= '9') {
sequence += e.key;
box.text(type + sequence);
} else if (e.key === 'Enter') {
ignore = false;
switch (type) {
case 's':
type = 'submissions';
break;
case 't':
type = 'teams';
break;
case 'p':
type = 'problems';
break;
case 'c':
type = 'clarifications';
break;
case 'j':
window.location = domjudge_base_url + '/jury/submissions/by-judging-id/' + sequence;
return;
}
var redirect_to = domjudge_base_url + '/jury/' + type;
if (sequence) {
redirect_to += '/' + sequence;
}
window.location = redirect_to;
} else {
ignore = false;
if (box) {
box.remove();
}
// We want to reset the `sequence` variable before redirecting, but then we do need to save the value typed by the user
var typedSequence = sequence;
sequence = '';
$body.off('keydown');
$body.on('keydown', oldFunc);
if (e.key === 'Enter') {
switch (type) {
case 's':
type = 'submissions';
break;
case 't':
type = 'teams';
break;
case 'p':
type = 'problems';
break;
case 'c':
type = 'clarifications';
break;
case 'j':
type = 'submissions/by-judging-id';
break;
}
var redirect_to = domjudge_base_url + '/jury/' + type;
if (typedSequence) {
redirect_to += '/' + typedSequence;
}
window.location = redirect_to;
}
}
});
}
Expand Down
Loading