From 74fc9a7af34a2d1f4a090427fbe7b05fe38678ae Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Tue, 4 May 2021 21:22:25 +0200
Subject: [PATCH] Fix HUD lists on 0.8.2

---
 module/rdd-token-hud.js | 73 ++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/module/rdd-token-hud.js b/module/rdd-token-hud.js
index 21a651b7..8d46bd3d 100644
--- a/module/rdd-token-hud.js
+++ b/module/rdd-token-hud.js
@@ -7,49 +7,51 @@ import { RdDUtility } from "./rdd-utility.js";
 /* -------------------------------------------- */
 export class RdDTokenHud {
 
-  static init(){
-      // Integration du TokenHUD
+  static init() {
+    // Integration du TokenHUD
     Hooks.on('renderTokenHUD', (app, html, data) => { RdDTokenHud.addTokenHudExtensions(app, html, data._id) });
   }
 
   /* -------------------------------------------- */
-  static async removeExtensionHud( app, html, tokenId) {
-    let combat = html.find('.control-icon.rdd-combat');
-    combat.remove();
-    let initiative = html.find('.control-icon.rdd-initiative');
-    initiative.remove();
+  static async removeExtensionHud(app, html, tokenId) {
+    html.find('.control-icon.rdd-combat').remove();
+    html.find('.control-icon.rdd-initiative').remove();
   }
 
   /* -------------------------------------------- */
-  static async addExtensionHud( app, html, tokenId ) {
+  static async addExtensionHud(app, html, tokenId) {
 
     let token = canvas.tokens.get(tokenId);
     let actor = token.actor;
     let combatant = game.combat.combatants.find(c => Misc.data(c).tokenId == tokenId);
     app.hasExtension = true;
 
-    let armesList = RdDCombatManager.buildListeActionsCombat(combatant) ;
-    const hudData = { combatant: combatant, armes: armesList, 
-                      commandes: [{ name: 'Initiative +1', command: 'inc', value: 0.01}, { name: 'Initiative -1',command: 'dec', value: -0.01}] };
+    let armesList = RdDCombatManager.buildListeActionsCombat(combatant);
+    const hudData = {
+      combatant: combatant, armes: armesList,
+      commandes: [{ name: 'Initiative +1', command: 'inc', value: 0.01 }, { name: 'Initiative -1', command: 'dec', value: -0.01 }]
+    };
 
+    const controlIconCombat = html.find('.control-icon[data-action=combat]');
     // initiative
-    await RdDTokenHud._configureSubMenu(html.find('.control-icon.combat'), 'systems/foundryvtt-reve-de-dragon/templates/hud-actor-init.html', hudData,
+    await RdDTokenHud._configureSubMenu(controlIconCombat, 'systems/foundryvtt-reve-de-dragon/templates/hud-actor-init.html', hudData,
       (event) => {
         let initCommand = event.currentTarget.attributes['data-command'].value;
         let combatantId = event.currentTarget.attributes['data-combatant-id'].value;
-        if ( !initCommand ) { 
+        if (!initCommand) {
           let armeIndex = event.currentTarget.attributes['data-arme-id'].value;
           let arme = armesList[armeIndex];
-          RdDCombatManager.rollInitiativeCompetence(combatantId, arme);          
+          RdDCombatManager.rollInitiativeCompetence(combatantId, arme);
         } else if (initCommand == 'inc') {
-          RdDCombatManager.incDecInit( combatantId, 0.01 );
-        } else if ( initCommand == 'dec') {
-          RdDCombatManager.incDecInit( combatantId, -0.01 );
+          RdDCombatManager.incDecInit(combatantId, 0.01);
+        } else if (initCommand == 'dec') {
+          RdDCombatManager.incDecInit(combatantId, -0.01);
         }
       });
 
+    const controlIconTarget = html.find('.control-icon[data-action=target]');
     // combat
-    await RdDTokenHud._configureSubMenu(html.find('.control-icon.target'), 'systems/foundryvtt-reve-de-dragon/templates/hud-actor-attaque.html', hudData,
+    await RdDTokenHud._configureSubMenu(controlIconTarget, 'systems/foundryvtt-reve-de-dragon/templates/hud-actor-attaque.html', hudData,
       (event) => {
         let armeIndex = event.currentTarget.attributes['data-arme-id'].value;
         let arme = armesList[armeIndex];
@@ -59,38 +61,35 @@ export class RdDTokenHud {
 
   /* -------------------------------------------- */
   static async addTokenHudExtensions(app, html, tokenId) {
-
-    html.find('.control-icon.combat').click(event => {
-      if ( event.currentTarget.className.includes('active')) {
-        RdDTokenHud.removeExtensionHud( app, html, tokenId);
+    const controlIconCombat  = html.find('.control-icon[data-action=combat]');
+    controlIconCombat.click(event => {
+      if (event.currentTarget.className.includes('active')) {
+        RdDTokenHud.removeExtensionHud(app, html, tokenId);
       } else {
-        setTimeout( function() { RdDTokenHud.addExtensionHud( app, html, tokenId) } , 200 );
+        setTimeout(function () { RdDTokenHud.addExtensionHud(app, html, tokenId) }, 200);
       }
-    } );
+    });
 
-    let combatIcon  = html.find('.control-icon.combat');
-    if ( combatIcon[0].className.includes('active') ) {
-      RdDTokenHud.addExtensionHud( app, html, tokenId);
+    if (controlIconCombat.length>0 && controlIconCombat[0].className.includes('active')) {
+      RdDTokenHud.addExtensionHud(app, html, tokenId);
     }
   }
 
   /* -------------------------------------------- */
   static async _configureSubMenu(insertionPoint, template, hudData, onMenuItem) {
     const hud = $(await renderTemplate(template, hudData));
-    const imgHud = hud.find('img.rdd-hud-togglebutton');
     const list = hud.find('div.rdd-hud-list');
-
-    hud.toggleClass('active');
-    HtmlUtility._showControlWhen(list, hud.hasClass('active'));
-
-    imgHud.click(event => {
-      hud.toggleClass('active');
-      HtmlUtility._showControlWhen(list, hud.hasClass('active'));
-    });
-
+    
+    RdDTokenHud._toggleHudListActive(hud, list);
+    
+    hud.find('img.rdd-hud-togglebutton').click(event => RdDTokenHud._toggleHudListActive(hud, list));
     list.find('.rdd-hud-menu').click(onMenuItem);
 
     insertionPoint.after(hud);
   }
 
+  static _toggleHudListActive(hud, list) {
+    hud.toggleClass('active');
+    HtmlUtility._showControlWhen(list, hud.hasClass('active'));
+  }
 }
\ No newline at end of file