From bf8b3253b97fb5d101c57c7325e1d3216e30188d Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 25 May 2020 12:15:52 +0200 Subject: [PATCH] Further firefox fixes --- artwork/thirdparty/kongregate/index.html | 4 ++-- src/js/application.js | 4 ++++ src/js/core/click_detector.js | 5 +++++ src/js/platform/browser/wrapper.js | 4 ---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/artwork/thirdparty/kongregate/index.html b/artwork/thirdparty/kongregate/index.html index 03a38db1..ce19f275 100644 --- a/artwork/thirdparty/kongregate/index.html +++ b/artwork/thirdparty/kongregate/index.html @@ -2,11 +2,11 @@ Redirecting to shapez.io - + Redirecting you to - shapez.io + shapez.io diff --git a/src/js/application.js b/src/js/application.js index 4ef3a2bf..27be4b1c 100644 --- a/src/js/application.js +++ b/src/js/application.js @@ -228,6 +228,7 @@ export class Application { * @param {Event} event */ handleVisibilityChange(event) { + window.focus(); const pageVisible = !document[pageHiddenPropName]; if (pageVisible !== this.pageVisible) { this.pageVisible = pageVisible; @@ -267,6 +268,7 @@ export class Application { onAppRenderableStateChanged(renderable) { logger.log("Application renderable:", renderable); + window.focus(); if (!renderable) { this.stateMgr.getCurrentState().onAppPause(); } else { @@ -326,6 +328,8 @@ export class Application { this.ticker.frameEmitted.add(this.onFrameEmitted, this); this.ticker.bgFrameEmitted.add(this.onBackgroundFrame, this); this.ticker.start(); + + window.focus(); } /** diff --git a/src/js/core/click_detector.js b/src/js/core/click_detector.js index a4aece50..557c1f28 100644 --- a/src/js/core/click_detector.js +++ b/src/js/core/click_detector.js @@ -155,6 +155,7 @@ export class ClickDetector { * @param {Event} event */ internalPreventClick(event) { + window.focus(); event.preventDefault(); } @@ -301,6 +302,8 @@ export class ClickDetector { * @param {TouchEvent|MouseEvent} event */ internalOnPointerDown(event) { + window.focus(); + if (!this.internalEventPreHandler(event, 1)) { return false; } @@ -369,6 +372,8 @@ export class ClickDetector { * @param {TouchEvent|MouseEvent} event */ internalOnPointerEnd(event) { + window.focus(); + if (!this.internalEventPreHandler(event, 0)) { return false; } diff --git a/src/js/platform/browser/wrapper.js b/src/js/platform/browser/wrapper.js index 5c5b0711..fa3f80b3 100644 --- a/src/js/platform/browser/wrapper.js +++ b/src/js/platform/browser/wrapper.js @@ -28,10 +28,6 @@ export class PlatformWrapperImplBrowser extends PlatformWrapperInterface { this.embedProvider.iframed = true; this.embedProvider.iogLink = false; - logger.log("Running focus-fix automatically"); - window.focus(); - setInterval(() => window.focus(), 1000); - switch (providerId) { case "armorgames": { this.embedProvider.id = "armorgames";