public/foundryvtt-reve-de-dragon
1
1
Fork 1
Code Issues 4 Pull Requests Actions Projects Releases 186 Wiki Activity

Preparation du passage en v12

Browse Source
This commit is contained in:
LeRatierBretonnien
2024-05-01 09:13:21 +02:00
parent ad9e75c66d
commit bc35c8d80e
38 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/time/rdd-calendrier.js
View File

@ -35,7 +35,7 @@ export class RdDCalendrier extends Application {
}
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
return foundry.utils.mergeObject(super.defaultOptions, {
title: "Calendrier",
template: TEMPLATE_CALENDRIER,
classes: ["calendar"],
@ -120,7 +120,7 @@ export class RdDCalendrier extends Application {
/* -------------------------------------------- */
fillCalendrierData(formData = {}) {
mergeObject(formData, this.timestamp.toCalendrier());
foundry.utils.mergeObject(formData, this.timestamp.toCalendrier());
formData.isGM = game.user.isGM;
formData.heures = RdDTimestamp.definitions()
formData.horlogeAnalogique = this.horlogeAnalogique;