Merge saved custom themes on top of defaultConfig when loading, to en…

…sure they get any new default config fields.
mcglincy · Dec 13, 2021 · e653d46 · e653d46
1 parent f9663f6
commit e653d46
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.13.1
+
+- Fix bug where custom themes wouldn't get defaults for new config settings.
+
 # 0.13.0
 
 - Make Dungeon Draw compatible with Foundry v9.

diff --git a/modules/dungeondraw-bundle.min.js b/modules/dungeondraw-bundle.min.js
diff --git a/modules/dungeondraw-bundle.min.js.map b/modules/dungeondraw-bundle.min.js.map
diff --git a/src/themes.js b/src/themes.js
@@ -47,7 +47,16 @@ export const getCustomThemes = () => {
       constants.MODULE_NAME,
       "customThemes"
     );
-    return JSON.parse(customThemesString);
+    const themeObj = JSON.parse(customThemesString);
+    // ensure saved custom themes get any new defaults
+    Object.keys(themeObj).forEach((key) => {
+      themeObj[key].config = foundry.utils.mergeObject(
+        defaultConfig(),
+        themeObj[key].config
+      );
+    });
+    console.log(themeObj);
+    return themeObj;
   } catch (e) {
     console.log(e);
     return {};