Merge branch 'master' into 066-switch-to-foundry-vtt-types

src/module/ds4.ts

@@ -29,8 +29,8 @@ Hooks.once("init", async function () {
     CONFIG.Item.entityClass = DS4Item as typeof Item;
 
     // Define localized type labels
-    CONFIG.Actor.typeLabels = DS4.actorTypes;
-    CONFIG.Item.typeLabels = DS4.itemTypes;
+    CONFIG.Actor.typeLabels = DS4.i18n.actorTypes;
+    CONFIG.Item.typeLabels = DS4.i18n.itemTypes;
 
     // Configure Dice
     CONFIG.Dice.types = [Die, DS4Check];
@@ -84,46 +84,16 @@ async function registerHandlebarsPartials() {
  * This function runs after game data has been requested and loaded from the servers, so entities exist
  */
 Hooks.once("setup", function () {
-    // Localize CONFIG objects once up-front
-    const toLocalize = [
-        "attackTypes",
-        "itemAvailabilities",
-        "itemTypes",
-        "armorTypes",
-        "armorTypesAbbr",
-        "armorMaterialTypes",
-        "armorMaterialTypesAbbr",
-        "armorMaterialTypes",
-        "spellTypes",
-        "spellCategories",
-        "attributes",
-        "traits",
-        "combatValues",
-        "characterBaseInfo",
-        "characterProgression",
-        "characterLanguage",
-        "characterProfile",
-        "characterCurrency",
-        "creatureTypes",
-        "creatureSizeCategories",
-        "creatureBaseInfo",
-        "temporalUnits",
-        "temporalUnitsAbbr",
-        "distanceUnits",
-        "distanceUnitsAbbr",
-        "chatVisibilities",
-    ];
-
     // Exclude some from sorting where the default order matters
     const noSort = ["attributes", "traits", "combatValues", "creatureSizeCategories"];
 
     // Localize and sort CONFIG objects
-    for (const o of toLocalize) {
-        const localized = Object.entries(CONFIG.DS4[o]).map((e) => {
+    for (const o of Object.keys(CONFIG.DS4.i18n)) {
+        const localized = Object.entries(CONFIG.DS4.i18n[o]).map((e) => {
             return [e[0], game.i18n.localize(e[1] as string)];
         });
         if (!noSort.includes(o)) localized.sort((a, b) => a[1].localeCompare(b[1]));
-        CONFIG.DS4[o] = localized.reduce((obj, e) => {
+        CONFIG.DS4.i18n[o] = localized.reduce((obj, e) => {
             obj[e[0]] = e[1];
             return obj;
         }, {});
@@ -133,3 +103,21 @@ Hooks.once("setup", function () {
 Hooks.once("ready", function () {
     migration.migrate();
 });
+
+/**
+ * Select the text of input elements in given sheets via onfocus listener.
+ * The hook names are of the form "render"+sheet_superclassname and are called within
+ * the render() method of the foundry Application class.
+ * Note: The render hooks of all classes in the class hierarchy are called,
+ * so e.g. for a Dialog, both "renderDialog" and "renderApplication" are called
+ * (in this order).
+ */
+["renderApplication", "renderActorSheet", "renderItemSheet"].forEach((hookName: string) => {
+    Hooks.on(hookName, (app: Dialog, html: JQueryStatic, data: any) => {
+        $(html)
+            .find("input")
+            .on("focus", (ev: JQuery.FocusEvent<HTMLInputElement>) => {
+                ev.currentTarget.select();
+            });
+    });
+});