From bb1d03c8a47366c8b95b1b445d416c83489a2f0c Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 1 Jan 2022 14:01:41 +0100 Subject: [PATCH 1/2] Autoformat --- module/actor-sheet.js | 9 +++++---- module/actor-vehicule-sheet.js | 26 +++++++++++++------------- module/item-sheet.js | 6 +++--- module/rdd-main.js | 2 +- module/rdd-sheet-utility.js | 2 +- module/rdd-utility.js | 2 +- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/module/actor-sheet.js b/module/actor-sheet.js index 808b1c70..4fe156db 100644 --- a/module/actor-sheet.js +++ b/module/actor-sheet.js @@ -80,7 +80,7 @@ export class RdDActorSheet extends ActorSheet { formData.competences.forEach(item => { item.visible = this.options.cherchercompetence ? RdDItemCompetence.nomContientTexte(item, this.options.cherchercompetence) - : ( !this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(item) ); + : (!this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(item)); RdDItemCompetence.levelUp(item, formData.data.compteurs.experience.value); }); @@ -135,6 +135,7 @@ export class RdDActorSheet extends ActorSheet { this.actor.addSubacteur(dragData.id || dragData.data._id); super._onDropActor(event, dragData); } + /* -------------------------------------------- */ async _onDropItem(event, dragData) { const destItemId = RdDSheetUtility.getItemId(event); @@ -215,7 +216,7 @@ export class RdDActorSheet extends ActorSheet { this.createEmptyTache(); }); html.find('.creer-un-objet').click(async event => { - RdDUtility.selectObjetType( this ); + RdDUtility.selectObjetType(this); }); html.find('.creer-une-oeuvre').click(async event => { RdDUtility.selectTypeOeuvre(this); @@ -324,7 +325,7 @@ export class RdDActorSheet extends ActorSheet { // Roll Weapon1 html.find('.arme-label a').click(async event => { let arme = this._getEventArmeCombat(event); - this.actor.rollArme( duplicate(arme) ); + this.actor.rollArme(duplicate(arme)); }); // Initiative pour l'arme html.find('.arme-initiative a').click(async event => { @@ -410,7 +411,7 @@ export class RdDActorSheet extends ActorSheet { this.actor.updateCompetenceArchetype(compName, parseInt(event.target.value)); }); } - + html.find('.show-hide-competences').click(async event => { this.options.showCompNiveauBase = !this.options.showCompNiveauBase; this.render(true); diff --git a/module/actor-vehicule-sheet.js b/module/actor-vehicule-sheet.js index 4ae2356c..b4a33c37 100644 --- a/module/actor-vehicule-sheet.js +++ b/module/actor-vehicule-sheet.js @@ -8,24 +8,24 @@ import { HtmlUtility } from "./html-utility.js"; import { Misc } from "./misc.js"; import { RdDSheetUtility } from "./rdd-sheet-utility.js"; -/* -------------------------------------------- */ +/* -------------------------------------------- */ export class RdDActorVehiculeSheet extends ActorSheet { /** @override */ - static get defaultOptions() { + static get defaultOptions() { RdDUtility.initAfficheContenu(); - return mergeObject(super.defaultOptions, { - classes: ["rdd", "sheet", "actor"], - template: "systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html", + return mergeObject(super.defaultOptions, { + classes: ["rdd", "sheet", "actor"], + template: "systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html", width: 640, height: 720, - tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac"}], - dragDrop: [{dragSelector: ".item-list .item", dropSelector: null}] + tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "carac" }], + dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }] }); } - /* -------------------------------------------- */ + /* -------------------------------------------- */ _checkNull(items) { if (items && items.length) { return items; @@ -67,10 +67,10 @@ export class RdDActorVehiculeSheet extends ActorSheet { return formData; } - + /* -------------------------------------------- */ async _onDropItem(event, dragData) { - const destItemId = RdDSheetUtility.getItemId(event); + const destItemId = $(event.target)?.closest('.item').attr('data-item-id'); const dropParams = RdDSheetUtility.prepareItemDropParameters(destItemId, this.actor.id, dragData, this.objetVersConteneur); const callSuper = await this.actor.processDropItem(dropParams); if (callSuper) { @@ -94,7 +94,7 @@ export class RdDActorVehiculeSheet extends ActorSheet { /* -------------------------------------------- */ /** @override */ - activateListeners(html) { + activateListeners(html) { super.activateListeners(html); HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM); @@ -114,7 +114,7 @@ export class RdDActorVehiculeSheet extends ActorSheet { }); html.find('.creer-un-objet').click(async event => { - RdDUtility.selectObjetType( this ); + RdDUtility.selectObjetType(this); }); html.find('#nettoyer-conteneurs').click(async event => { this.actor.nettoyerConteneurs(); @@ -134,7 +134,7 @@ export class RdDActorVehiculeSheet extends ActorSheet { }); } - + /* -------------------------------------------- */ /** @override */ setPosition(options = {}) { diff --git a/module/item-sheet.js b/module/item-sheet.js index 204fa00b..2bade3f8 100644 --- a/module/item-sheet.js +++ b/module/item-sheet.js @@ -243,7 +243,7 @@ export class RdDItemSheet extends ItemSheet { async _onDragStart(event) { console.log("_onDragStart", event); - if ( event.target.classList.contains("entity-link") ) return; + if (event.target.classList.contains("entity-link")) return; const itemId = event.srcElement?.attributes["data-item-id"].value; const item = this.actor.items.get(itemId); @@ -267,10 +267,10 @@ export class RdDItemSheet extends ItemSheet { } const allowed = Hooks.call("dropActorSheetData", this.actor, this, data); - if ( allowed === false ) return; + if (allowed === false) return; // Handle different data types - switch ( data.type ) { + switch (data.type) { case "Item": return this._onDropItem(event, data); } diff --git a/module/rdd-main.js b/module/rdd-main.js index 26659b31..1c7321c9 100644 --- a/module/rdd-main.js +++ b/module/rdd-main.js @@ -268,7 +268,7 @@ async function migrationPngWebp_1_5_34() { await Item.updateDocuments(itemsUpdates); await Actor.updateDocuments(actorsUpdates); game.actors.forEach(actor => { - if (actor.data.token?.img && actor.data.token.img.match(regexOldPngJpg)){ + if (actor.data.token?.img && actor.data.token.img.match(regexOldPngJpg)) { actor.update({ "token.img": convertImgToWebp(actor.data.token.img) }); } const actorItemsToUpdate = prepareDocumentsImgUpdate(actor.items); diff --git a/module/rdd-sheet-utility.js b/module/rdd-sheet-utility.js index d1d9548b..8db1ce1a 100644 --- a/module/rdd-sheet-utility.js +++ b/module/rdd-sheet-utility.js @@ -33,7 +33,7 @@ export class RdDSheetUtility { } } - static async splitItem(item, actor, onSplit = ()=>{}) { + static async splitItem(item, actor, onSplit = () => { }) { const dialog = await DialogSplitItem.create(item, async (item, split) => { await RdDSheetUtility._onSplitItem(item, split, actor); onSplit(); diff --git a/module/rdd-utility.js b/module/rdd-utility.js index 53dbf002..5ee377a4 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -339,7 +339,7 @@ export class RdDUtility { } /* -------------------------------------------- */ - static initAfficheContenu(actorId) { // persistent handling of conteneur show/hide + static initAfficheContenu() { // persistent handling of conteneur show/hide if (!this.afficheContenu) this.afficheContenu = {}; } From 28fa6138bc513f15dc3b570e27c26b4131514fa6 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 1 Jan 2022 14:02:27 +0100 Subject: [PATCH 2/2] Fix drop on item uses target, not currentTarget --- module/actor-sheet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/actor-sheet.js b/module/actor-sheet.js index 4fe156db..a273878b 100644 --- a/module/actor-sheet.js +++ b/module/actor-sheet.js @@ -138,7 +138,7 @@ export class RdDActorSheet extends ActorSheet { /* -------------------------------------------- */ async _onDropItem(event, dragData) { - const destItemId = RdDSheetUtility.getItemId(event); + const destItemId = $(event.target)?.closest('.item').attr('data-item-id'); const dropParams = RdDSheetUtility.prepareItemDropParameters(destItemId, this.actor.id, dragData, this.objetVersConteneur); const callSuper = await this.actor.processDropItem(dropParams); if (callSuper) {