Skip to content

Commit a950c26

Browse files
authored
Merge pull request #1826 from codidact/0valt/keyboard
Keyboard event-related fixes + notifications improvements
2 parents 9d96c89 + 2abc96a commit a950c26

15 files changed

Lines changed: 477 additions & 338 deletions

File tree

app/assets/javascripts/character_count.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ $(() => {
9191
} else if (gteThreshold) {
9292
setCounterState($counter, 'warning');
9393
setCounterIcon($icon, 'fa-exclamation-circle');
94+
setInputValidationState($tgt, 'valid');
9495
} else {
9596
setCounterState($counter, 'default');
9697
setCounterIcon($icon, 'fa-check');

app/assets/javascripts/comments.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,24 @@ $(() => {
4141
window.hljs && hljs.highlightAll();
4242
}
4343

44-
$(document).on('click', '.post--comments-thread.is-inline a', async (evt) => {
45-
if (evt.ctrlKey) {
46-
return; // TODO: do we need this early exit?
44+
$(document).on('click', '.post--comments-thread.is-inline a', async (ev) => {
45+
if (ev.ctrlKey || ev.metaKey) {
46+
return;
4747
}
4848

49-
evt.preventDefault();
49+
ev.preventDefault();
5050

51-
const $tgt = $(evt.target);
51+
const $tgt = $(ev.target);
5252
const $threadId = $tgt.data('thread');
5353
const wrapper = getCommentThreadWrapper($tgt);
5454

5555
openThread(wrapper, $threadId);
5656
});
5757

5858
$(document).on('click', '.js-show-deleted-comments', (ev) => {
59-
if (ev.ctrlKey) {
59+
if (ev.ctrlKey || ev.metaKey) {
6060
return;
61-
} // do we really need it?
61+
}
6262

6363
ev.preventDefault();
6464

0 commit comments

Comments
 (0)