From 714efeb4ab315292e4f04adef4f9582e7fe979b0 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Thu, 7 Jan 2021 11:55:54 +0100 Subject: [PATCH 1/3] prevent error when trying to manage active effects on an owned item --- src/module/item/item-sheet.ts | 44 ++++++++++++++++--------- src/templates/item/partials/effects.hbs | 8 +++-- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/src/module/item/item-sheet.ts b/src/module/item/item-sheet.ts index 8670dc3..b9bc127 100644 --- a/src/module/item/item-sheet.ts +++ b/src/module/item/item-sheet.ts @@ -52,6 +52,9 @@ export class DS4ItemSheet extends ItemSheet { return position; } + private readonly ownedItemActiveEffectWarning = + "Managing Active Effects within an Owned Item is not currently supported and will be added in a subsequent update."; + /* -------------------------------------------- */ /** @override */ @@ -60,29 +63,38 @@ export class DS4ItemSheet extends ItemSheet { if (!this.options.editable) return; - html.find(".effect-create").on("click", this._onEffectCreate.bind(this)); - - html.find(".effect-edit").on("click", (ev) => { - const li = $(ev.currentTarget).parents(".effect"); - console.log(li.data("effectId")); - const effect = this.item.effects.get(li.data("effectId")); - effect.sheet.render(true); - }); - - html.find(".effect-delete").on("click", async (ev) => { - const li = $(ev.currentTarget).parents(".effect"); - await this.item.deleteEmbeddedEntity("ActiveEffect", li.data("effectId")); - }); + html.find(".effect-control").on("click", this._onManageActiveEffect.bind(this)); } /** - * Handle creating a new ActiveEffect for the item using initial data defined in the HTML dataset + * Handle management of ActiveEffects. * @param {Event} event The originating click event - * @private */ - private async _onEffectCreate(event: JQuery.ClickEvent): Promise { + private async _onManageActiveEffect(event: JQuery.ClickEvent): Promise { event.preventDefault(); + if (this.item.isOwned) { + return ui.notifications.warn(this.ownedItemActiveEffectWarning); + } + const a = event.currentTarget; + const li = $(a).parents(".effect"); + + switch (a.dataset["action"]) { + case "create": + return this._createActiveEffect(); + case "edit": + const effect = this.item.effects.get(li.data("effectId")); + return effect.sheet.render(true); + case "delete": { + return this.item.deleteEmbeddedEntity("ActiveEffect", li.data("effectId")); + } + } + } + + /** + * Create a new ActiveEffect for the item using default data. + */ + private async _createActiveEffect(): Promise { const label = `New Effect`; const createData = { diff --git a/src/templates/item/partials/effects.hbs b/src/templates/item/partials/effects.hbs index 819290d..b4cf02b 100644 --- a/src/templates/item/partials/effects.hbs +++ b/src/templates/item/partials/effects.hbs @@ -5,7 +5,7 @@
Name
- Add effect
@@ -13,8 +13,10 @@

  • {{effect.label}}

    - - + +
    • {{/each}} From 7685efa8a6aa181f0fb314ae1767e63b4a316f27 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Thu, 7 Jan 2021 12:04:25 +0100 Subject: [PATCH 2/3] localize warning --- src/lang/en.json | 3 ++- src/module/item/item-sheet.ts | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lang/en.json b/src/lang/en.json index 84c7d54..7b449b3 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -101,5 +101,6 @@ "DS4.ProfilHairColor": "Hair Color", "DS4.ProfileWeight": "Weight", "DS4.ProfileEyeColor": "Eye Color", - "DS4.ProfileSpecialCharacteristics": "Special Characteristics" + "DS4.ProfileSpecialCharacteristics": "Special Characteristics", + "DS4.WarningManageActiveEffectOnOwnedItem": "Managing Active Effects within an Owned Item is not currently supported and will be added in a subsequent update." } diff --git a/src/module/item/item-sheet.ts b/src/module/item/item-sheet.ts index b9bc127..8d8df70 100644 --- a/src/module/item/item-sheet.ts +++ b/src/module/item/item-sheet.ts @@ -52,9 +52,6 @@ export class DS4ItemSheet extends ItemSheet { return position; } - private readonly ownedItemActiveEffectWarning = - "Managing Active Effects within an Owned Item is not currently supported and will be added in a subsequent update."; - /* -------------------------------------------- */ /** @override */ @@ -74,7 +71,7 @@ export class DS4ItemSheet extends ItemSheet { event.preventDefault(); if (this.item.isOwned) { - return ui.notifications.warn(this.ownedItemActiveEffectWarning); + return ui.notifications.warn(game.i18n.localize("DS4.WarningManageActiveEffectOnOwnedItem")); } const a = event.currentTarget; const li = $(a).parents(".effect"); From 16ea39f81d06859cea3623ba92cc4901ce708e91 Mon Sep 17 00:00:00 2001 From: Johannes Loher Date: Thu, 7 Jan 2021 23:59:50 +0100 Subject: [PATCH 3/3] remove redundant effect classes --- src/templates/item/partials/effects.hbs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/templates/item/partials/effects.hbs b/src/templates/item/partials/effects.hbs index b4cf02b..b829bfa 100644 --- a/src/templates/item/partials/effects.hbs +++ b/src/templates/item/partials/effects.hbs @@ -5,18 +5,16 @@
    Name
    - Add effect + Add + effect
    {{#each item.effects as |effect id|}}

  • {{effect.label}}

    - - + +
    • {{/each}}