Preparation du passage en v12
This commit is contained in:
@ -71,7 +71,7 @@ export class ReglesOptionnelles extends FormApplication {
|
||||
|
||||
static get defaultOptions() {
|
||||
const options = super.defaultOptions;
|
||||
mergeObject(options, {
|
||||
foundry.utils.mergeObject(options, {
|
||||
id: "regles-optionnelles",
|
||||
template: "systems/foundryvtt-reve-de-dragon/templates/settings/regles-optionnelles.html",
|
||||
height: 650,
|
||||
|
@ -27,7 +27,7 @@ export class SystemCompendiums extends FormApplication {
|
||||
static init() {
|
||||
Object.keys(CONFIGURABLE_COMPENDIUMS).forEach(compendium => {
|
||||
const definition = CONFIGURABLE_COMPENDIUMS[compendium];
|
||||
mergeObject(definition, {
|
||||
foundry.utils.mergeObject(definition, {
|
||||
compendium: compendium,
|
||||
default: SystemCompendiums._getDefaultCompendium(compendium),
|
||||
setting: SystemCompendiums._getSettingCompendium(compendium)
|
||||
@ -138,7 +138,7 @@ export class SystemCompendiums extends FormApplication {
|
||||
|
||||
static get defaultOptions() {
|
||||
const options = super.defaultOptions;
|
||||
mergeObject(options, {
|
||||
foundry.utils.mergeObject(options, {
|
||||
id: "system-compendiums",
|
||||
template: "systems/foundryvtt-reve-de-dragon/templates/settings/system-compendiums.html",
|
||||
height: 'fit-content',
|
||||
@ -152,7 +152,7 @@ export class SystemCompendiums extends FormApplication {
|
||||
|
||||
getData() {
|
||||
const systemCompendiums = Object.values(CONFIGURABLE_COMPENDIUMS)
|
||||
.map(it => mergeObject(it, { value: SystemCompendiums.getCompendium(it.compendium) }));
|
||||
.map(it => foundry.utils.mergeObject(it, { value: SystemCompendiums.getCompendium(it.compendium) }));
|
||||
const availableCompendiums = game.packs.map(pack => {
|
||||
return {
|
||||
name: pack.collection,
|
||||
@ -160,7 +160,7 @@ export class SystemCompendiums extends FormApplication {
|
||||
type: pack.metadata.type
|
||||
}
|
||||
});
|
||||
return mergeObject(super.getData(), {
|
||||
return foundry.utils.mergeObject(super.getData(), {
|
||||
systemCompendiums: systemCompendiums,
|
||||
availableCompendiums: availableCompendiums
|
||||
});
|
||||
|
Reference in New Issue
Block a user