Skip to content

Commit f006b57

Browse files
sahilmahnasernowmarijnh
authored andcommitted
Add keyboard spacebar interactive for merge editor buttons
1 parent d4d7d3c commit f006b57

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

addon/merge/merge.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@
610610
lock.setAttribute("tabindex", "0");
611611
var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
612612
CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
613-
CodeMirror.on(lock, "keyup", function(e) { e.key === "Enter" && setScrollLock(dv, !dv.lockScroll); });
613+
CodeMirror.on(lock, "keyup", function(e) { (e.key === "Enter" || e.code === "Space") && setScrollLock(dv, !dv.lockScroll); });
614614
var gapElts = [lockWrap];
615615
if (dv.mv.options.revertButtons !== false) {
616616
dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
@@ -624,7 +624,7 @@
624624
copyChunk(dv, dv.edit, dv.orig, node.chunk);
625625
}
626626
CodeMirror.on(dv.copyButtons, "click", copyButtons);
627-
CodeMirror.on(dv.copyButtons, "keyup", function(e) { e.key === "Enter" && copyButtons(e); });
627+
CodeMirror.on(dv.copyButtons, "keyup", function(e) { (e.key === "Enter" || e.code === "Space") && copyButtons(e); });
628628
gapElts.unshift(dv.copyButtons);
629629
}
630630
if (dv.mv.options.connect != "align") {

0 commit comments

Comments
 (0)