From 7bea2e3b29b540d89dd42fbee1f2f5e037ea25dd Mon Sep 17 00:00:00 2001 From: sladecraven Date: Mon, 28 Dec 2020 10:11:47 +0100 Subject: [PATCH] #82 : Affichage TMR sur fermeture sort --- module/actor.js | 8 +++++--- module/rdd-roll.js | 7 ++++--- system.json | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/module/actor.js b/module/actor.js index ad8e571f..5b41ef75 100644 --- a/module/actor.js +++ b/module/actor.js @@ -1217,9 +1217,11 @@ export class RdDActor extends Actor { coutreve: Array(20).fill().map((item, index) => 1 + index) } - if ( this.currentTMR) this.currentTMR.minimize(); // Hide + if ( this.currentTMR ) this.currentTMR.minimize(); // Hide const dialog = await RdDRoll.create(this, rollData, - {html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-sort.html'}, + { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-sort.html', + close: html => { this.currentTMR.maximize() } // Re-display TMR + }, { name: 'lancer-un-sort', label: 'Lancer un sort', @@ -1235,7 +1237,7 @@ export class RdDActor extends Actor { this.createCallbackExperience(), { action: r => this._rollUnSortResult(r, true) } ] - } + }, ); dialog.render(true); } diff --git a/module/rdd-roll.js b/module/rdd-roll.js index 27fbd436..29dff523 100644 --- a/module/rdd-roll.js +++ b/module/rdd-roll.js @@ -24,7 +24,7 @@ export class RdDRoll extends Dialog { if (dialogConfig.options) { mergeObject(options, dialogConfig.options, { overwrite: true }) } - return new RdDRoll(actor, rollData, html, options, actions); + return new RdDRoll(actor, rollData, html, options, actions, dialogConfig.close ); } /* -------------------------------------------- */ @@ -67,12 +67,13 @@ export class RdDRoll extends Dialog { } /* -------------------------------------------- */ - constructor(actor, rollData, html, options, actions) { + constructor(actor, rollData, html, options, actions, close = undefined) { let conf = { title: actions[0].label, content: html, buttons: {}, - default: actions[0].name + default: actions[0].name, + close: close }; for (let action of actions) { conf.buttons[action.name] = { label: action.label, callback: html => this.onAction(action, html) }; diff --git a/system.json b/system.json index 7563e5ce..234242a3 100644 --- a/system.json +++ b/system.json @@ -2,7 +2,7 @@ "name": "foundryvtt-reve-de-dragon", "title": "Rêve de Dragon", "description": "Rêve de Dragon RPG for FoundryVTT", - "version": "1.1.21", + "version": "1.1.22", "minimumCoreVersion": "0.7.5", "compatibleCoreVersion": "0.7.8", "templateVersion": 72,