Skip to content

Commit

Permalink
Remove onchange patch (#33)
Browse files Browse the repository at this point in the history
* onchange patch

Removed attaching an onchange event to core setting. Instead places it in `then` promise.

* Update CHANGELOG.md

* Update module.json

* v1.4.5

switched to await.
Fixed function logic.
Added Comment to end of Line in hopes to make it easy to find to remove.

* Update CHANGELOG.md
  • Loading branch information
mouse0270 authored Sep 26, 2022
1 parent fada700 commit da05e46
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# v1.4.5
- Moved window reload logic to `await` instead of core settings `onchange` event. Fixes incompatibility between MM+ and Ftc

# v1.4.4

- Now compatible with FVTT v10, thanks to @arcanist
Expand Down
14 changes: 4 additions & 10 deletions js/find-the-culprit.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@ function registerSetting() {
});
}

// Temporarily required by foundryvtt/foundryvtt#7740
Hooks.on("setup", () => {
if (game.release?.generation >= 10) {
game.settings.settings.get(`core.${ModuleManagement.CONFIG_SETTING}`).onChange =
foundry.utils.debouncedReload ?? window.location.reload;
}
});

Hooks.on("renderModuleManagement", onRenderModuleManagement);

function onRenderModuleManagement(app, html, options) {
Expand Down Expand Up @@ -354,7 +346,8 @@ async function deactivationStep(chosenModules = []) {
await game.settings.set(moduleName, "modules", currSettings);
}

game.settings.set("core", ModuleManagement.CONFIG_SETTING, original);
await game.settings.set("core", ModuleManagement.CONFIG_SETTING, original)
(foundry.utils.debouncedReload ?? window.location.reload)(); // Temporarily required by foundryvtt/foundryvtt#7740
}

async function reactivateModules() {
Expand All @@ -364,7 +357,8 @@ async function reactivateModules() {
);
for (let mod in curr.original) original[mod] = curr.original[mod];

game.settings.set("core", ModuleManagement.CONFIG_SETTING, original);
await game.settings.set("core", ModuleManagement.CONFIG_SETTING, original)
(foundry.utils.debouncedReload ?? window.location.reload)(); // Temporarily required by foundryvtt/foundryvtt#7740
}

async function resetSettings() {
Expand Down
4 changes: 2 additions & 2 deletions module.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"bugs": "https://github.com/Moerill/fvtt-find-the-culprit/issues",
"changelog": "https://github.com/Moerill/fvtt-find-the-culprit/blob/master/CHANGELOG.md",
"flags": {},
"version": "1.4.4",
"version": "1.4.5",
"compatibility": {
"minimum": "9",
"verified": "10"
Expand All @@ -32,6 +32,6 @@
"dependencies": [],
"socket": false,
"manifest": "https://raw.githubusercontent.com/Moerill/fvtt-find-the-culprit/master/module.json",
"download": "https://github.com/Moerill/fvtt-find-the-culprit/releases/download/v1.4.4/v1.4.4.zip",
"download": "https://github.com/Moerill/fvtt-find-the-culprit/releases/download/v1.4.5/v1.4.5.zip",
"protected": false
}

0 comments on commit da05e46

Please sign in to comment.