From 6552dbdc8a8ca9865cb3175c4efe275faa75efa1 Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Sat, 26 Dec 2020 13:31:41 -0500 Subject: [PATCH] typing fixes for data --- js/003-data/slaveWearData.js | 5 ++--- src/interaction/siWardrobe.js | 6 +++--- src/js/itemAvailability.js | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/js/003-data/slaveWearData.js b/js/003-data/slaveWearData.js index acce98a8329..ee5f17b6f40 100644 --- a/js/003-data/slaveWearData.js +++ b/js/003-data/slaveWearData.js @@ -828,7 +828,7 @@ App.Data.clothes = new Map([ */ /** - * @typedef {Map<string, slaveWear|slaveWearChastity>} slaveWearCategory + * @typedef {Map<string, slaveWear>} slaveWearCategory */ /** @type {Object.<string, slaveWearCategory>} */ @@ -1267,13 +1267,12 @@ App.Data.buttplugs = new Map([ /** * @typedef {object} slaveWearChastity * @property {string} name - * @property {string} value * @property {object} updateSlave * @property {FC.FutureSociety} [fs] */ /** @type {Map<string, slaveWearChastity>} */ -App.Data.slaveWear.chastityDevices = new Map([ +App.Data.chastityDevices = new Map([ // '.value' must be a string, so using update slave so I can update multiple values. ["none", { diff --git a/src/interaction/siWardrobe.js b/src/interaction/siWardrobe.js index 6db2efd28da..5ce522bbb18 100644 --- a/src/interaction/siWardrobe.js +++ b/src/interaction/siWardrobe.js @@ -7,7 +7,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) { let filters = {}; const el = document.createElement("span"); el.id = "content"; - el.append(contents()) + el.append(contents()); return el; @@ -34,7 +34,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) { App.UI.DOM.appendNewElement("h3", frag, `Shopping`); frag.append(shopping()); - + return frag; } @@ -756,7 +756,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) { let optionsArray = []; - for (const [key, object] of App.Data.slaveWear.chastityDevices) { + for (const [key, object] of App.Data.chastityDevices) { if (key === "none") { // skip none in set, we set the link elsewhere. continue; diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js index 3721d2bf853..d8975c4fcb1 100644 --- a/src/js/itemAvailability.js +++ b/src/js/itemAvailability.js @@ -46,7 +46,7 @@ globalThis.isItemAccessible = (function() { selectedDB = App.Data.shoes; break; case "chastity": - selectedDB = App.Data.slaveWear.chastityDevices; + selectedDB = App.Data.chastityDevices; break; default: // console.log(`made a category for ${category} automatically, may need to define this by hand`); -- GitLab