Merge pull request #54 from etiquettestartshere/1.1.8

more expansion fixes...

module.json

@@ -1,7 +1,7 @@
 {
   "id": "effectivetray",
   "title": "Effective Tray",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "compatibility": {
     "minimum": "11",
     "verified": "11"

scripts/effective-tray.mjs

@@ -219,10 +219,10 @@ export class effectiveTray {
     if (!game.settings.get(MODULE, "expandEffect")) return;
     const tray = html.querySelector('.effects-tray');
     if (!tray) return;
+    const mid = message.id;
     await new Promise(r => setTimeout(r, 100));
     tray.classList.remove("collapsed");
-    if (game.settings.get(MODULE, "systemDefault")) return;
-    tray.classList.remove("collapsed");
+    if (game.settings.get(MODULE, "scrollOnExpand")) _scroll(mid);
   };
 
   // Check and see if the effects tray needs to be scrolled
@@ -273,9 +273,9 @@ export class effectiveDamage {
   // Expand the damage tray
   static async _expandDamage(message, html) {
     if (!game.settings.get(MODULE, "expandDamage")) return;
+    await new Promise(r => setTimeout(r, 100));
     const tray = html.querySelector('.damage-tray');
     if (!tray) return;
-    await new Promise(r => setTimeout(r, 100));
     tray.classList.remove("collapsed");
     tray.classList.add("et-uncollapsed");
     const mid = message.id;
@@ -338,6 +338,21 @@ export class effectiveDamage {
   /*  Socket Handling                             */
   /* -------------------------------------------- */
 
+// Register the socket
+export class effectiveSocket {
+  static init() {
+    game.socket.on(socketID, (data) => {
+      switch (data.type) {
+        case "firstCase":
+          _effectSocket(data);
+          break;
+        case "secondCase":
+          _damageSocket(data);  
+      };
+    });
+  };
+};
+
 // Make the GM client apply effects to the socket emitter's targets
 async function _effectSocket(data) {
   if (game.user !== game.users.activeGM) return;
@@ -364,21 +379,6 @@ function _damageSocket(data) {
   _applyTargetDamage(id, options, dmg);
 };
 
-// Register the socket
-export class effectiveSocket {
-  static init() {
-    game.socket.on(socketID, (data) => {
-      switch (data.type) {
-        case "firstCase":
-          _effectSocket(data);
-          break;
-        case "secondCase":
-          _damageSocket(data);  
-      };
-    });
-  };
-};
-
   /* -------------------------------------------- */
   /*  Functions                                   */
   /* -------------------------------------------- */

scripts/settings.mjs

@@ -21,7 +21,7 @@ export class moduleSettings {
     game.settings.register(MODULE, "contextTarget", {
       name: "EFFECTIVETRAY.ContextTargetSettingName",
       hint: "EFFECTIVETRAY.ContextTargetSettingHint",
-      scope: "world",
+      scope: "client",
       config: true,
       type: Boolean,
       default: false,