From b0699c54618b77548e0c5b6e0a5e991176f2d703 Mon Sep 17 00:00:00 2001 From: Gustave Michel III Date: Sat, 20 Mar 2021 00:41:40 -0500 Subject: [PATCH 1/3] Potential Fix for Joysticks on New Versions of Chrome --- js/gamepad/gamepad.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/js/gamepad/gamepad.js b/js/gamepad/gamepad.js index c87dd69..3011356 100755 --- a/js/gamepad/gamepad.js +++ b/js/gamepad/gamepad.js @@ -200,13 +200,14 @@ define([ // We only refresh the display when we detect some gamepads are new // or removed; we do it by comparing raw gamepad table entries to - // “undefined.” + // null.” var gamepadsChanged = false; for (var i = 0; i < rawGamepads.length; i++) { - if (typeof rawGamepads[i] != prevRawGamepadTypes[i]) { + var gamepadState = (rawGamepads[i] == null)?false:true; + if (gamepadState != prevRawGamepadTypes[i]) { gamepadsChanged = true; - prevRawGamepadTypes[i] = typeof rawGamepads[i]; + prevRawGamepadTypes[i] = gamepadState; } if (rawGamepads[i]) { From 5f7629f00c64bc34939a827f96ec389af36d0d80 Mon Sep 17 00:00:00 2001 From: Gustave Michel III Date: Sat, 20 Mar 2021 16:10:06 -0500 Subject: [PATCH 2/3] Added Gamepad undefined check for backwards compatibility --- js/gamepad/gamepad.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/gamepad/gamepad.js b/js/gamepad/gamepad.js index 3011356..f320519 100755 --- a/js/gamepad/gamepad.js +++ b/js/gamepad/gamepad.js @@ -200,11 +200,11 @@ define([ // We only refresh the display when we detect some gamepads are new // or removed; we do it by comparing raw gamepad table entries to - // null.” + // null or undefined.” var gamepadsChanged = false; for (var i = 0; i < rawGamepads.length; i++) { - var gamepadState = (rawGamepads[i] == null)?false:true; + var gamepadState = (rawGamepads[i] == null || rawGamepads[i] == undefined)?false:true; if (gamepadState != prevRawGamepadTypes[i]) { gamepadsChanged = true; prevRawGamepadTypes[i] = gamepadState; From b45a7620c2e1438d0a6bb2980bae1a64c485bf4b Mon Sep 17 00:00:00 2001 From: Gustave Michel III Date: Sat, 20 Mar 2021 16:11:19 -0500 Subject: [PATCH 3/3] Gamepads detection comment formatting fix --- js/gamepad/gamepad.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/gamepad/gamepad.js b/js/gamepad/gamepad.js index f320519..2464345 100755 --- a/js/gamepad/gamepad.js +++ b/js/gamepad/gamepad.js @@ -200,7 +200,7 @@ define([ // We only refresh the display when we detect some gamepads are new // or removed; we do it by comparing raw gamepad table entries to - // null or undefined.” + // "null" or "undefined.” var gamepadsChanged = false; for (var i = 0; i < rawGamepads.length; i++) {