Skip to content

Commit 01cb123

Browse files
sbc100uysalibov
authored andcommitted
Merge conflict in sdl and glfw keycodes.
From emscripten-core#22864
1 parent e17b54a commit 01cb123

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/library_glfw.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ var LibraryGLFW = {
422422
// Prevent default backspace and tab behavior when the target
423423
// is not an input or textarea. Otherwise, no text in the site can be deleted.
424424
if (event.target.tagName !== "INPUT" && event.target.tagName !== "TEXTAREA" &&
425-
(event.keyCode === 8 /* backspace */ || event.keyCode === 9 /* tab */)) {
425+
(event.key == 'Backspace' || event.key == 'Tab')) {
426426
event.preventDefault();
427427
}
428428
},

src/library_sdl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ var LibrarySDL = {
693693
// is not an input or textarea. Otherwise, no text in the site can be deleted.
694694
if (event.type !== 'keydown' ||
695695
(!SDL.unicode && !SDL.textInput) ||
696-
((event.keyCode === 8 /* backspace */ || event.keyCode === 9 /* tab */ ) &&
696+
((event.key == 'Backspace' || event.key == 'Tab') &&
697697
event.target.tagName !== "INPUT" && event.target.tagName !== "TEXTAREA")) {
698698
event.preventDefault();
699699
}

0 commit comments

Comments
 (0)