From 2f344c90e4321bab678545764feda77aa73f8f87 Mon Sep 17 00:00:00 2001 From: WBHarry Date: Mon, 27 Oct 2025 14:04:43 +0100 Subject: [PATCH] . --- module/applications/ui/countdownEdit.mjs | 16 +++++++--------- module/applications/ui/countdowns.mjs | 6 +----- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/module/applications/ui/countdownEdit.mjs b/module/applications/ui/countdownEdit.mjs index 2dcef338..2098fb10 100644 --- a/module/applications/ui/countdownEdit.mjs +++ b/module/applications/ui/countdownEdit.mjs @@ -13,15 +13,14 @@ export default class CountdownEdit extends HandlebarsApplicationMixin(Applicatio this.hideNewCountdowns = false; } - get title() { - return game.i18n.localize('DAGGERHEART.APPLICATIONS.CountdownEdit.title'); - } - static DEFAULT_OPTIONS = { classes: ['daggerheart', 'dialog', 'dh-style', 'countdown-edit'], tag: 'form', position: { width: 600 }, - window: { icon: 'fa-solid fa-clock-rotate-left' }, + window: { + title: 'DAGGERHEART.APPLICATIONS.CountdownEdit.title', + icon: 'fa-solid fa-clock-rotate-left' + }, actions: { addCountdown: CountdownEdit.#addCountdown, toggleCountdownEdit: CountdownEdit.#toggleCountdownEdit, @@ -83,8 +82,7 @@ export default class CountdownEdit extends HandlebarsApplicationMixin(Applicatio canPerformEdit() { if (game.user.isGM) return true; - const noGM = !game.users.find(x => x.isGM && x.active); - if (noGM) { + if (!game.users.activeGM) { ui.notifications.warn(game.i18n.localize('DAGGERHEART.UI.Notifications.gmRequired')); return false; } @@ -109,7 +107,7 @@ export default class CountdownEdit extends HandlebarsApplicationMixin(Applicatio static async updateData(_event, _, formData) { const { hideNewCountdowns, ...settingsData } = foundry.utils.expandObject(formData.object); - + // Sync current and max if max is changing and they were equal before for (const [id, countdown] of Object.entries(settingsData.countdowns ?? {})) { const existing = this.data.countdowns[id]; @@ -119,7 +117,7 @@ export default class CountdownEdit extends HandlebarsApplicationMixin(Applicatio } else { countdown.progress.current = Math.min(countdown.progress.current, countdown.progress.max); } - } + } this.hideNewCountdowns = hideNewCountdowns; this.updateSetting(settingsData); diff --git a/module/applications/ui/countdowns.mjs b/module/applications/ui/countdowns.mjs index 075944a3..07eac74b 100644 --- a/module/applications/ui/countdowns.mjs +++ b/module/applications/ui/countdowns.mjs @@ -25,7 +25,7 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application window: { icon: 'fa-solid fa-clock-rotate-left', frame: true, - title: 'Fear', + title: 'DAGGERHEART.UI.Countdowns.title', positioned: false, resizable: false, minimizable: false @@ -50,10 +50,6 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application } }; - get title() { - return game.i18n.localize('DAGGERHEART.UI.Countdowns.title'); - } - get element() { return document.body.querySelector('.daggerheart.dh-style.countdowns'); }