Skip to content

Commit 4456537

Browse files
committed
Update dialogs for deleting documents.
1 parent 5782fcf commit 4456537

File tree

3 files changed

+14
-20
lines changed

3 files changed

+14
-20
lines changed

module/pipelines/effects.mjs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,10 @@ export async function onManageActiveEffect(event, owner, action) {
150150
case 'delete': {
151151
const _effect = resolveEffect();
152152
if (canBeRemoved(_effect)) {
153-
if (
154-
await foundry.applications.api.DialogV2.confirm({
155-
title: game.i18n.format('FU.DialogDeleteItemTitle', { item: _effect.name }),
156-
content: game.i18n.format('FU.DialogDeleteItemDescription', { item: _effect.name }),
157-
rejectClose: false,
158-
})
159-
) {
153+
const title = StringUtils.localize('FU.DialogDeleteItemTitle', { item: _effect.name });
154+
const content = StringUtils.localize('FU.DialogDeleteItemDescription', { item: _effect.name });
155+
const confirm = await FoundryUtils.confirmDialog(title, content);
156+
if (confirm) {
160157
sendToChatEffectRemoved(_effect, owner);
161158
return _effect.delete();
162159
}

module/sheets/actor-sheet-utils.mjs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { FUPartySheet } from './actor-party-sheet.mjs';
33
import { FUHooks } from '../hooks.mjs';
44
import { FUItem } from '../documents/items/item.mjs';
55
import { PseudoItem } from '../documents/items/pseudo-item.mjs';
6+
import FoundryUtils from '../helpers/foundry-utils.mjs';
7+
import { StringUtils } from '../helpers/string-utils.mjs';
68

79
/**
810
* @description Prepares model-agnostic data for the actor
@@ -227,13 +229,10 @@ async function _onItemDelete(element, sheet) {
227229
return;
228230
}
229231

230-
if (
231-
await foundry.applications.api.DialogV2.confirm({
232-
window: { title: game.i18n.format('FU.DialogDeleteItemTitle', { item: item.name }) },
233-
content: game.i18n.format('FU.DialogDeleteItemDescription', { item: item.name }),
234-
rejectClose: false,
235-
})
236-
) {
232+
const title = StringUtils.localize('FU.DialogDeleteItemTitle', { item: item.name });
233+
const content = StringUtils.localize('FU.DialogDeleteItemDescription', { item: item.name });
234+
const confirm = await FoundryUtils.confirmDialog(title, content);
235+
if (confirm) {
237236
await item.delete();
238237
sheet.render(false); // Removed `jq.slideUp` since it's jQuery-specific
239238
}

module/sheets/item-sheet.mjs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -732,12 +732,10 @@ export class FUItemSheet extends api.HandlebarsApplicationMixin(sheets.ItemSheet
732732
promises.push(this.item.actor.createEmbeddedDocuments('Item', [itemObject]));
733733
promises.push(item.delete());
734734
} else {
735-
const doDelete = await foundry.applications.api.DialogV2.confirm({
736-
window: { title: game.i18n.format('FU.DialogDeleteItemTitle', { item: item.name }) },
737-
content: game.i18n.format('FU.DialogDeleteItemDescription', { item: item.name }),
738-
rejectClose: false,
739-
});
740-
if (doDelete) {
735+
const title = StringUtils.localize('FU.DialogDeleteItemTitle', { item: item.name });
736+
const content = StringUtils.localize('FU.DialogDeleteItemDescription', { item: item.name });
737+
const confirm = await FoundryUtils.confirmDialog(title, content);
738+
if (confirm) {
741739
promises.push(item.delete());
742740
}
743741
}

0 commit comments

Comments
 (0)