From 54fc1e8e1a20c9ac15550c5700ad7094c8189fe8 Mon Sep 17 00:00:00 2001 From: fabres Date: Sat, 18 Jul 2026 00:08:18 +0200 Subject: [PATCH] fix(migration): StatusEffects + SystemCompendiums -> ApplicationV2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Plus aucun FormApplication V1 dans module/settings/. - Tous les settings menus migrés vers HandlebarsApplicationMixin(ApplicationV2) - Templates sans wrapper
- Scrollbar via LESS pour #status-effects et #system-compendiums - Listeners jQuery -> DOM natif dans _onRender --- css/foundryvtt-reve-de-dragon.css | 6 +- less/foundryvtt-reve-de-dragon.less | 6 +- module/settings/status-effects.js | 68 ++++++++++------------- module/settings/system-compendiums.js | 68 ++++++++--------------- templates/settings/status-effects.hbs | 4 +- templates/settings/system-compendiums.hbs | 4 +- 6 files changed, 67 insertions(+), 89 deletions(-) diff --git a/css/foundryvtt-reve-de-dragon.css b/css/foundryvtt-reve-de-dragon.css index cfb6f5e5..ea765751 100644 --- a/css/foundryvtt-reve-de-dragon.css +++ b/css/foundryvtt-reve-de-dragon.css @@ -4902,9 +4902,13 @@ body { .system-foundryvtt-reve-de-dragon .window-app.regles-optionnelles > .window-content, .system-foundryvtt-reve-de-dragon .window-app.dialog-encaissement-tables > .window-content, .system-foundryvtt-reve-de-dragon .window-app.options-avancees > .window-content, +.system-foundryvtt-reve-de-dragon .window-app.status-effects > .window-content, +.system-foundryvtt-reve-de-dragon .window-app.system-compendiums > .window-content, .system-foundryvtt-reve-de-dragon #regles-optionnelles > .window-content, .system-foundryvtt-reve-de-dragon #dialog-encaissement-tables > .window-content, -.system-foundryvtt-reve-de-dragon #options-avancees > .window-content { +.system-foundryvtt-reve-de-dragon #options-avancees > .window-content, +.system-foundryvtt-reve-de-dragon #status-effects > .window-content, +.system-foundryvtt-reve-de-dragon #system-compendiums > .window-content { overflow-y: auto; } .system-foundryvtt-reve-de-dragon .encaissement-tables { diff --git a/less/foundryvtt-reve-de-dragon.less b/less/foundryvtt-reve-de-dragon.less index 6449b185..40ee2afb 100644 --- a/less/foundryvtt-reve-de-dragon.less +++ b/less/foundryvtt-reve-de-dragon.less @@ -77,9 +77,13 @@ .window-app.regles-optionnelles > .window-content, .window-app.dialog-encaissement-tables > .window-content, .window-app.options-avancees > .window-content, + .window-app.status-effects > .window-content, + .window-app.system-compendiums > .window-content, #regles-optionnelles > .window-content, #dialog-encaissement-tables > .window-content, - #options-avancees > .window-content { + #options-avancees > .window-content, + #status-effects > .window-content, + #system-compendiums > .window-content { overflow-y: auto; } diff --git a/module/settings/status-effects.js b/module/settings/status-effects.js index 762157e9..3859f25c 100644 --- a/module/settings/status-effects.js +++ b/module/settings/status-effects.js @@ -2,6 +2,8 @@ import { RDD_CONFIG, SYSTEM_RDD } from "../constants.js"; import { Misc } from "../misc.js"; import { RdDBonus } from "../rdd-bonus.js"; +const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api; + export const STATUSES = { StatusGrappling: 'grappling', StatusGrappled: 'grappled', @@ -46,7 +48,7 @@ const rddStatusEffects = [ const statusDemiSurprise = new Set([STATUSES.StatusStunned, STATUSES.StatusProne, STATUSES.StatusRestrained, STATUSES.StatusForceWeak]) const statusSurpriseTotale = new Set([STATUSES.StatusUnconscious, STATUSES.StatusBlind, STATUSES.StatusComma]) -export class StatusEffects extends FormApplication { +export class StatusEffects extends HandlebarsApplicationMixin(ApplicationV2) { static onReady() { const rddEffectIds = rddStatusEffects.map(it => it.id) @@ -151,51 +153,41 @@ export class StatusEffects extends FormApplication { return demiReveStatusEffect; } - constructor(...args) { - super(...args); + static DEFAULT_OPTIONS = { + tag: "form", + id: "status-effects", + classes: ["rdd-dialog", "status-effects"], + form: { submitOnChange: false, closeOnSubmit: true }, + position: { width: 350, height: 800 }, + window: { title: "Choix des status/effets", icon: "fa-solid fa-bars" } } - static get defaultOptions() { - const options = super.defaultOptions; - foundry.utils.mergeObject(options, { - id: "status-effects", - template: "systems/foundryvtt-reve-de-dragon/templates/settings/status-effects.hbs", - classes: ["rdd-dialog", "status-effects"], - height: 800, - width: 350, - minimizable: false, - closeOnSubmit: true, - title: "Choix des status/effets" - }); - return options; + static PARTS = { + form: { template: "systems/foundryvtt-reve-de-dragon/templates/settings/status-effects.hbs" } } - getData() { + async _prepareContext() { const used = StatusEffects._getUseStatusEffects(); - let formData = super.getData(); - formData.effects = foundry.utils.duplicate(CONFIG.RDD.allEffects); - formData.effects.forEach(it => it.active = used.includes(it.id)) - return formData; + const effects = foundry.utils.duplicate(CONFIG.RDD.allEffects); + effects.forEach(it => it.active = used.includes(it.id)) + return { effects } } - activateListeners(html) { - $(html).find(".select-effect").click((event) => { - let id = event.currentTarget.attributes.name?.value; - if (id) { - let selected = StatusEffects._getUseStatusEffects(); - let isChecked = event.currentTarget.checked; - if (isChecked) { - selected.push(id); + async _onRender(context, options) { + this.element.querySelectorAll(".select-effect").forEach(el => { + el.addEventListener("click", async event => { + let id = event.currentTarget.getAttribute("name"); + if (id) { + let selected = StatusEffects._getUseStatusEffects(); + let isChecked = event.currentTarget.checked; + if (isChecked) { + selected.push(id); + } else { + selected = selected.filter(it => it != id) + } + StatusEffects._setUseStatusEffects(selected); } - else { - selected = selected.filter(it => it != id) - } - StatusEffects._setUseStatusEffects(selected); - } + }); }); } - - async _updateObject(event, formData) { - this.close(); - } } diff --git a/module/settings/system-compendiums.js b/module/settings/system-compendiums.js index fa9993a2..44118753 100644 --- a/module/settings/system-compendiums.js +++ b/module/settings/system-compendiums.js @@ -6,6 +6,8 @@ import { Misc } from "../misc.js"; import { RdDDice } from "../rdd-dice.js"; import { ReglesOptionnelles } from "./regles-optionnelles.js"; +const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api; + const COMPENDIUM_SETTING_PREFIX = 'compendium-'; const CONFIGURABLE_COMPENDIUMS = { @@ -24,10 +26,7 @@ const CONFIGURABLE_COMPENDIUMS = { 'equipement': { label: "Equipements", type: "Item" }, } -/** - * ======= Gestion des accès aux compendiums systèmes (ou surchargés) ======= - */ -export class SystemCompendiums extends FormApplication { +export class SystemCompendiums extends HandlebarsApplicationMixin(ApplicationV2) { static initSettings() { Object.keys(CONFIGURABLE_COMPENDIUMS).forEach(compendium => { const definition = CONFIGURABLE_COMPENDIUMS[compendium]; @@ -85,7 +84,6 @@ export class SystemCompendiums extends FormApplication { return [] } - /* -------------------------------------------- */ static async getWorldOrCompendiumItems(itemType, compendium) { let items = game.items.filter(it => it.type == itemType) if (compendium) { @@ -118,19 +116,16 @@ export class SystemCompendiums extends FormApplication { return elements; } - /* -------------------------------------------- */ static async loadCompendiumData(compendium) { const pack = game.packs.get(compendium); return await pack?.getDocuments() ?? []; } - /* -------------------------------------------- */ static async loadCompendium(compendium, filter = item => true) { let compendiumData = await SystemCompendiums.loadCompendiumData(compendium); return compendiumData.filter(filter); } - static async getDefaultItems(compendium) { const pack = game.packs.get(SystemCompendiums._getDefaultCompendium(compendium)); if (pack.metadata.type == 'Item') { @@ -152,25 +147,20 @@ export class SystemCompendiums extends FormApplication { return `${SYSTEM_RDD}.${compendium}`; } - constructor(...args) { - super(...args); + static DEFAULT_OPTIONS = { + tag: "form", + id: "system-compendiums", + classes: ["system-compendiums"], + form: { submitOnChange: false, closeOnSubmit: true }, + position: { width: 600, height: "auto" }, + window: { title: "Compendiums système", icon: "fa-solid fa-bars" } } - static get defaultOptions() { - const options = super.defaultOptions; - foundry.utils.mergeObject(options, { - id: "system-compendiums", - template: "systems/foundryvtt-reve-de-dragon/templates/settings/system-compendiums.hbs", - height: 'fit-content', - width: 600, - minimizable: false, - closeOnSubmit: true, - title: "Compendiums système" - }); - return options; + static PARTS = { + form: { template: "systems/foundryvtt-reve-de-dragon/templates/settings/system-compendiums.hbs" } } - getData() { + async _prepareContext() { const systemCompendiums = Object.values(CONFIGURABLE_COMPENDIUMS) .map(it => foundry.utils.mergeObject(it, { value: SystemCompendiums.getCompendium(it.compendium) }, { inplace: false })) const availableCompendiums = game.packs.map(pack => { @@ -180,26 +170,21 @@ export class SystemCompendiums extends FormApplication { type: pack.metadata.type } }); - return foundry.utils.mergeObject(super.getData(), { - systemCompendiums: systemCompendiums, - availableCompendiums: availableCompendiums - }, { inplace: false }) + return { systemCompendiums, availableCompendiums } } - activateListeners(html) { - $(html).find("select.system-compendium-setting").change((event) => { - const compendium = $(event.currentTarget).data('compendium') - const value = $(event.currentTarget).val(); - const systemCompendium = CONFIGURABLE_COMPENDIUMS[compendium]; - - game.settings.set(SYSTEM_RDD, systemCompendium.setting, value); + async _onRender(context, options) { + this.element.querySelectorAll("select.system-compendium-setting").forEach(el => { + el.addEventListener("change", async event => { + const compendium = event.currentTarget.dataset.compendium + const value = event.currentTarget.value; + const systemCompendium = CONFIGURABLE_COMPENDIUMS[compendium]; + await game.settings.set(SYSTEM_RDD, systemCompendium.setting, value); + }); }); } } -/** - * ======= Gestion de jets dans une table correspondant à un compendium ======= - */ export class CompendiumTable { constructor(compendium, type, subTypes = undefined, sorting = undefined) { @@ -234,9 +219,6 @@ export class CompendiumTable { } } -/** - * ======= Gestion de tables correspondant à un compendium ======= - */ export class CompendiumTableHelpers { static buildTable(elements, itemFrequence) { @@ -272,7 +254,6 @@ export class CompendiumTableHelpers { return await CompendiumTableHelpers.selectRow(table, forcedRoll); } - /* -------------------------------------------- */ static async selectRow(table, forcedRoll = undefined) { if (table.length == 0) { return undefined @@ -289,7 +270,6 @@ export class CompendiumTableHelpers { return row; } - /* -------------------------------------------- */ static async tableRowToChatMessage(row, type, options = {}) { if (options.showSource == undefined){ options.showSource = ReglesOptionnelles.isUsing('afficher-table-source') @@ -314,7 +294,6 @@ export class CompendiumTableHelpers { { rollMode: options.rollMode })) } - /* -------------------------------------------- */ static async tableToChatMessage(table, type, subTypes, typeName = undefined) { const flavorContent = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-compendium-table.hbs', { img: RdDItem.getDefaultImg(subTypes[0]), @@ -330,5 +309,4 @@ export class CompendiumTableHelpers { } )) } - -} \ No newline at end of file +} diff --git a/templates/settings/status-effects.hbs b/templates/settings/status-effects.hbs index c7f7a285..0614dadd 100644 --- a/templates/settings/status-effects.hbs +++ b/templates/settings/status-effects.hbs @@ -1,4 +1,4 @@ - +
    {{#each effects as |effect key|}}
  • @@ -12,5 +12,5 @@
    • {{/each}}
- +
diff --git a/templates/settings/system-compendiums.hbs b/templates/settings/system-compendiums.hbs index fa976734..992f60f4 100644 --- a/templates/settings/system-compendiums.hbs +++ b/templates/settings/system-compendiums.hbs @@ -1,4 +1,4 @@ -
+
    {{#each systemCompendiums as |definition key|}}
  • @@ -15,5 +15,5 @@
    • {{/each}}
- +