From 231a3c81f452cc776624219cf9839641dd6a4757 Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 22 Jun 2020 14:44:47 +0200 Subject: [PATCH 1/2] Fix typo --- src/js/game/hub_goals.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index ef7797a9..9f65dc4c 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -275,7 +275,7 @@ export class HubGoals extends BasicSerializableObject { * @param {string} upgradeId * @returns {boolean} */ - tryUnlockUgprade(upgradeId) { + tryUnlockUpgrade(upgradeId) { if (!this.canUnlockUpgrade(upgradeId)) { return false; } From c5613f6eeed63ea3d1079c4adf16dafd02693f2f Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 22 Jun 2020 14:46:33 +0200 Subject: [PATCH 2/2] Regression --- src/js/changelog.js | 1 - src/js/core/input_distributor.js | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/js/changelog.js b/src/js/changelog.js index b654f0de..7650814b 100644 --- a/src/js/changelog.js +++ b/src/js/changelog.js @@ -15,7 +15,6 @@ export const CHANGELOG = [ "Improve visibility of shape background in dark mode", "Added sound when destroying a building", "Update tutorial image for tier 2 tunnels to explain mix/match (by jimmyshadow1)", - "Prevent default actions on all keybindings in the web version so you don't accidentally use builtin browser shortcuts", ], }, { diff --git a/src/js/core/input_distributor.js b/src/js/core/input_distributor.js index a59f4fbc..03ad8e0c 100644 --- a/src/js/core/input_distributor.js +++ b/src/js/core/input_distributor.js @@ -191,7 +191,17 @@ export class InputDistributor { */ handleKeyMouseDown(event) { const keyCode = event instanceof MouseEvent ? event.button + 1 : event.keyCode; - event.preventDefault(); + if ( + keyCode === 4 || // MB4 + keyCode === 5 || // MB5 + keyCode === 9 || // TAB + keyCode === 16 || // SHIFT + keyCode === 17 || // CTRL + keyCode === 18 || // ALT + (keyCode >= 112 && keyCode < 122) // F1 - F10 + ) { + event.preventDefault(); + } const isInitial = !this.keysDown.has(keyCode); this.keysDown.add(keyCode);