From 20856891b63a14f0ea03a173033027971e04f69f Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Wed, 18 Jun 2025 01:15:45 +0200 Subject: [PATCH] Don't open global settings window in iframe --- src/ext/lib/settings/SiteSettings.ts | 7 +++++++ src/ext/lib/uwui/UI.js | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ext/lib/settings/SiteSettings.ts b/src/ext/lib/settings/SiteSettings.ts index 8b1b9ca..3d06a22 100644 --- a/src/ext/lib/settings/SiteSettings.ts +++ b/src/ext/lib/settings/SiteSettings.ts @@ -59,6 +59,13 @@ export class SiteSettings { * @returns */ private getSettingsForSite() { + if (!this.site) { + return { + siteSettings: this.settings.active.sites['@global'], + usesSettingsFor: '@global' + }; + } + if (this.settings.active.sites[this.site]) { return { siteSettings: this.settings.active.sites[this.site], diff --git a/src/ext/lib/uwui/UI.js b/src/ext/lib/uwui/UI.js index e6e44c5..fd9a427 100644 --- a/src/ext/lib/uwui/UI.js +++ b/src/ext/lib/uwui/UI.js @@ -23,6 +23,7 @@ class UI { this.lastProbeResponseTs = null; this.isGlobal = uiConfig.isGlobal ?? false; + this.isIframe = window.self !== window.top; this.eventBus = uiConfig.eventBus; this.disablePointerEvents = false; @@ -241,7 +242,7 @@ class UI { }, 'uw-set-ui-state': { function: (config, routingData) => { - if (config.globalUiVisible !== undefined) { + if (config.globalUiVisible !== undefined && !this.isIframe) { if (this.isGlobal) { this.setUiVisibility(config.globalUiVisible); } else {