From a1d6aa99d377f18654755455ad313585c57a25b1 Mon Sep 17 00:00:00 2001
From: Kim Mantas <kim.mantas@gmail.com>
Date: Fri, 8 Nov 2024 18:50:42 +0000
Subject: [PATCH] Fix double-escape of application IDs.

---
 module/applications/actor/config/base-proficiency-config.mjs | 2 +-
 module/applications/actor/config/traits-config.mjs           | 2 +-
 module/applications/api/application-v2-mixin.mjs             | 2 +-
 module/applications/shared/movement-senses-config.mjs        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/applications/actor/config/base-proficiency-config.mjs b/module/applications/actor/config/base-proficiency-config.mjs
index 71993e3d39..ff5c913b5b 100644
--- a/module/applications/actor/config/base-proficiency-config.mjs
+++ b/module/applications/actor/config/base-proficiency-config.mjs
@@ -51,7 +51,7 @@ export default class BaseProficiencyConfig extends BaseConfigSheet {
   /** @inheritDoc */
   _initializeApplicationOptions(options) {
     options = super._initializeApplicationOptions(options);
-    options.uniqueId = `${options.trait}-${options.key}-${options.document.uuid}`;
+    options.uniqueId = `${options.trait}-${options.key}-${options.document.uuid}`.replace(/\./g, "-");
     return options;
   }
 
diff --git a/module/applications/actor/config/traits-config.mjs b/module/applications/actor/config/traits-config.mjs
index baa2fd9925..7270878da7 100644
--- a/module/applications/actor/config/traits-config.mjs
+++ b/module/applications/actor/config/traits-config.mjs
@@ -54,7 +54,7 @@ export default class TraitsConfig extends BaseConfigSheet {
     if ( !CONFIG.DND5E.traits[options.trait] ) throw new Error(
       `Cannot instantiate TraitsConfig with a trait not defined in CONFIG.DND5E.traits: ${options.trait}.`
     );
-    options.uniqueId = `${options.trait}-${options.document.uuid}`;
+    options.uniqueId = `${options.trait}-${options.document.uuid}`.replace(/\./g, "-");
     return options;
   }
 
diff --git a/module/applications/api/application-v2-mixin.mjs b/module/applications/api/application-v2-mixin.mjs
index 7c98607088..a03d1e9267 100644
--- a/module/applications/api/application-v2-mixin.mjs
+++ b/module/applications/api/application-v2-mixin.mjs
@@ -36,7 +36,7 @@ export default Base => class extends HandlebarsApplicationMixin(Base) {
     const applicationOptions = super._initializeApplicationOptions(options);
     // Fix focus bug caused by the use of UUIDs in application IDs
     // TODO: Remove once https://github.com/foundryvtt/foundryvtt/issues/11742 is fixed
-    applicationOptions.uniqueId = CSS.escape(applicationOptions.uniqueId);
+    applicationOptions.uniqueId = applicationOptions.uniqueId.replace(/\./g, "-");
     return applicationOptions;
   }
 
diff --git a/module/applications/shared/movement-senses-config.mjs b/module/applications/shared/movement-senses-config.mjs
index 025c3aae4e..ec3f1aad34 100644
--- a/module/applications/shared/movement-senses-config.mjs
+++ b/module/applications/shared/movement-senses-config.mjs
@@ -62,7 +62,7 @@ export default class MovementSensesConfig extends BaseConfigSheet {
   /** @inheritDoc */
   _initializeApplicationOptions(options) {
     options = super._initializeApplicationOptions(options);
-    options.uniqueId = `${options.type}-${options.document.uuid}`;
+    options.uniqueId = `${options.type}-${options.document.uuid}`.replace(/\./g, "-");
     return options;
   }