From 085847644c51987c3cca85076224aa3347c57517 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+Tropix126@users.noreply.github.com> Date: Sat, 25 Jun 2022 02:34:30 -0500 Subject: [PATCH] remove usage of e.which (#1196) * remove usage of e.which * this comment is no longer necessary --- renderer/src/builtins/developer/debugger.js | 2 +- renderer/src/builtins/developer/devtools.js | 2 +- renderer/src/builtins/developer/inspectelement.js | 2 +- renderer/src/ui/publicservers/menu.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/renderer/src/builtins/developer/debugger.js b/renderer/src/builtins/developer/debugger.js index eafec227..fffebbe4 100644 --- a/renderer/src/builtins/developer/debugger.js +++ b/renderer/src/builtins/developer/debugger.js @@ -14,7 +14,7 @@ export default new class DeveloperMode extends Builtin { } debugListener(e) { - if (e.which === 119 || e.which == 118) { // F8 + if (e.key === "F7" || e.key == "F8") { debugger; // eslint-disable-line no-debugger e.preventDefault(); e.stopImmediatePropagation(); diff --git a/renderer/src/builtins/developer/devtools.js b/renderer/src/builtins/developer/devtools.js index 2536a115..96dc22b9 100644 --- a/renderer/src/builtins/developer/devtools.js +++ b/renderer/src/builtins/developer/devtools.js @@ -13,7 +13,7 @@ export default new class DevToolsListener extends Builtin { } toggleDevTools(e) { - if (e.ctrlKey && e.shiftKey && e.which === 73) { // Ctrl + Shift + I + if (e.ctrlKey && e.shiftKey && e.key === "I") { e.stopPropagation(); e.preventDefault(); if (this.get(this.collection, this.category, this.id)) IPC.toggleDevTools(); diff --git a/renderer/src/builtins/developer/inspectelement.js b/renderer/src/builtins/developer/inspectelement.js index 43563c94..e033da03 100644 --- a/renderer/src/builtins/developer/inspectelement.js +++ b/renderer/src/builtins/developer/inspectelement.js @@ -15,7 +15,7 @@ export default new class InspectElement extends Builtin { } inspectElement(e) { - if (e.ctrlKey && e.shiftKey && e.which === 67) { // Ctrl + Shift + C + if (e.ctrlKey && e.shiftKey && e.key === "C") { // Ctrl + Shift + C IPC.inspectElement(); } } diff --git a/renderer/src/ui/publicservers/menu.js b/renderer/src/ui/publicservers/menu.js index 0a35faf1..626ae542 100644 --- a/renderer/src/ui/publicservers/menu.js +++ b/renderer/src/ui/publicservers/menu.js @@ -75,7 +75,7 @@ export default class PublicServers extends React.Component { } searchKeyDown(e) { - if (this.state.loading || e.which !== 13) return; + if (this.state.loading || e.key !== "Enter") return; const term = e.target.value; if (this.state.tab == "Featured" || this.state.tab == "Popular") this.setState({tab: "All"}, () => this.search(term)); else this.search(term);