diff --git a/src/facilities/pit/pit.js b/src/facilities/pit/pit.js
index 552b6eed57d4510f5454a41efc62eac986a09ee8..1c223828f429244a4a2c7109c28663516a57c740 100644
--- a/src/facilities/pit/pit.js
+++ b/src/facilities/pit/pit.js
@@ -76,12 +76,12 @@ App.Facilities.Pit.pit = function() {
App.UI.DOM.link("Open them for free", () => {
V.pit.audience = "free";
- App.UI.DOM.refresh(mainDiv, audience);
+ App.UI.DOM.replace(mainDiv, audience);
}),
App.UI.DOM.link("Open them and charge admission", () => {
V.pit.audience = "paid";
- App.UI.DOM.refresh(mainDiv, audience);
+ App.UI.DOM.replace(mainDiv, audience);
})
);
} else if (V.pit.audience === "free") {
@@ -91,12 +91,12 @@ App.Facilities.Pit.pit = function() {
App.UI.DOM.link("Close them", () => {
V.pit.audience = "none";
- App.UI.DOM.refresh(mainDiv, audience);
+ App.UI.DOM.replace(mainDiv, audience);
}),
App.UI.DOM.link("Charge admission", () => {
V.pit.audience = "paid";
- App.UI.DOM.refresh(mainDiv, audience);
+ App.UI.DOM.replace(mainDiv, audience);
})
);
} else {
@@ -106,12 +106,12 @@ App.Facilities.Pit.pit = function() {
App.UI.DOM.link("Close them", () => {
V.pit.audience = "none";
- App.UI.DOM.refresh(mainDiv, audience);
+ App.UI.DOM.replace(mainDiv, audience);
}),
App.UI.DOM.link("Stop charging admission", () => {
V.pit.audience = "free";
- App.UI.DOM.refresh(mainDiv, audience);
+ App.UI.DOM.replace(mainDiv, audience);
})
);
}
@@ -140,7 +140,7 @@ App.Facilities.Pit.pit = function() {
V.pit.fighterIDs.delete(V.BodyguardID);
}
- App.UI.DOM.refresh(mainDiv, fighters);
+ App.UI.DOM.replace(mainDiv, fighters);
}));
// if (V.activeCanine || V.activeHooved || V.activeFeline) {
@@ -152,7 +152,7 @@ App.Facilities.Pit.pit = function() {
// V.pit.fighterIDs.delete(V.BodyguardID);
// }
- // App.UI.DOM.refresh(mainDiv, fighters);
+ // App.UI.DOM.replace(mainDiv, fighters);
// }));
// }
} else {
@@ -164,13 +164,13 @@ App.Facilities.Pit.pit = function() {
V.pit.bodyguardFights = false;
V.pit.animal = null;
- App.UI.DOM.refresh(mainDiv, fighters);
+ App.UI.DOM.replace(mainDiv, fighters);
}),
App.UI.DOM.link("Have them fight your bodyguard", () => {
V.pit.bodyguardFights = true;
V.pit.animal = null;
- App.UI.DOM.refresh(mainDiv, fighters);
+ App.UI.DOM.replace(mainDiv, fighters);
}));
} else {
mainDiv.append(`Two fighters will be selected from the pool at random.`);
@@ -181,7 +181,7 @@ App.Facilities.Pit.pit = function() {
V.pit.bodyguardFights = true;
V.pit.animal = null;
- App.UI.DOM.refresh(mainDiv, fighters);
+ App.UI.DOM.replace(mainDiv, fighters);
})
);
}
@@ -192,7 +192,7 @@ App.Facilities.Pit.pit = function() {
// V.pit.bodyguardFights = false;
// V.pit.animal = new FC.Facilities.Animal();
- // App.UI.DOM.refresh(mainDiv, fighters);
+ // App.UI.DOM.replace(mainDiv, fighters);
// })
// );
// }
@@ -220,7 +220,7 @@ App.Facilities.Pit.pit = function() {
App.UI.DOM.link("Nonlethal", () => {
V.pit.lethal = false;
- App.UI.DOM.refresh(mainDiv, lethality);
+ App.UI.DOM.replace(mainDiv, lethality);
})
);
} else {
@@ -230,7 +230,7 @@ App.Facilities.Pit.pit = function() {
App.UI.DOM.link("Nonlethal", () => {
V.pit.lethal = false;
- App.UI.DOM.refresh(mainDiv, lethality);
+ App.UI.DOM.replace(mainDiv, lethality);
})
);
}
@@ -242,7 +242,7 @@ App.Facilities.Pit.pit = function() {
App.UI.DOM.link("Lethal", () => {
V.pit.lethal = true;
- App.UI.DOM.refresh(mainDiv, lethality);
+ App.UI.DOM.replace(mainDiv, lethality);
})
);
} else {
@@ -252,7 +252,7 @@ App.Facilities.Pit.pit = function() {
App.UI.DOM.link("Lethal", () => {
V.pit.lethal = true;
- App.UI.DOM.refresh(mainDiv, lethality);
+ App.UI.DOM.replace(mainDiv, lethality);
})
);
}
@@ -281,17 +281,17 @@ App.Facilities.Pit.pit = function() {
App.UI.DOM.link("Vaginal", () => {
V.pit.virginities = "vaginal";
- App.UI.DOM.refresh(mainDiv, virginities);
+ App.UI.DOM.replace(mainDiv, virginities);
}),
App.UI.DOM.link("Anal", () => {
V.pit.virginities = "anal";
- App.UI.DOM.refresh(mainDiv, virginities);
+ App.UI.DOM.replace(mainDiv, virginities);
}),
App.UI.DOM.link("All", () => {
V.pit.virginities = "all";
- App.UI.DOM.refresh(mainDiv, virginities);
+ App.UI.DOM.replace(mainDiv, virginities);
})
);
} else if (V.pit.virginities === "vaginal") {
@@ -302,17 +302,17 @@ App.Facilities.Pit.pit = function() {
App.UI.DOM.link("Neither", () => {
V.pit.virginities = "neither";
- App.UI.DOM.refresh(mainDiv, virginities);
+ App.UI.DOM.replace(mainDiv, virginities);
}),
App.UI.DOM.link("Anal", () => {
V.pit.virginities = "anal";
- App.UI.DOM.refresh(mainDiv, virginities);
+ App.UI.DOM.replace(mainDiv, virginities);
}),
App.UI.DOM.link("All", () => {
V.pit.virginities = "all";
- App.UI.DOM.refresh(mainDiv, virginities);
+ App.UI.DOM.replace(mainDiv, virginities);
})
);
} else if (V.pit.virginities === "anal") {
@@ -323,17 +323,17 @@ App.Facilities.Pit.pit = function() {
App.UI.DOM.link("Neither", () => {
V.pit.virginities = "neither";
- App.UI.DOM.refresh(mainDiv, virginities);
+ App.UI.DOM.replace(mainDiv, virginities);
}),
App.UI.DOM.link("Vaginal", () => {
V.pit.virginities = "vaginal";
- App.UI.DOM.refresh(mainDiv, virginities);
+ App.UI.DOM.replace(mainDiv, virginities);
}),
App.UI.DOM.link("All", () => {
V.pit.virginities = "all";
- App.UI.DOM.refresh(mainDiv, virginities);
+ App.UI.DOM.replace(mainDiv, virginities);
})
);
} else {
@@ -344,17 +344,17 @@ App.Facilities.Pit.pit = function() {
App.UI.DOM.link("Neither", () => {
V.pit.virginities = "neither";
- App.UI.DOM.refresh(mainDiv, virginities);
+ App.UI.DOM.replace(mainDiv, virginities);
}),
App.UI.DOM.link("Vaginal", () => {
V.pit.virginities = "vaginal";
- App.UI.DOM.refresh(mainDiv, virginities);
+ App.UI.DOM.replace(mainDiv, virginities);
}),
App.UI.DOM.link("Anal", () => {
V.pit.virginities = "anal";
- App.UI.DOM.refresh(mainDiv, virginities);
+ App.UI.DOM.replace(mainDiv, virginities);
})
);
}
@@ -377,7 +377,7 @@ App.Facilities.Pit.pit = function() {
linkSpan.append(App.UI.DOM.link("Cancel it", () => {
V.pit.slaveFightingBodyguard = null;
- App.UI.DOM.refresh(mainDiv, scheduled);
+ App.UI.DOM.replace(mainDiv, scheduled);
}));
mainDiv.appendChild(linkSpan);
diff --git a/src/interaction/killSlave.js b/src/interaction/killSlave.js
index 6b43156c4f4dcb1cd1c6eb590fb1ec2ff3f6fcb6..a3e1c9a02963809001cd63722e1f997b604898b9 100644
--- a/src/interaction/killSlave.js
+++ b/src/interaction/killSlave.js
@@ -131,10 +131,10 @@ App.UI.SlaveInteract.killSlave = function(slave) {
links.push(
App.UI.DOM.link(`Kill ${him}`, () => {
- App.UI.DOM.refresh(linksDiv, kill);
+ App.UI.DOM.replace(linksDiv, kill);
}),
App.UI.DOM.link(`Have mercy on ${him}`, () => {
- App.UI.DOM.refresh(linksDiv, mercy);
+ App.UI.DOM.replace(linksDiv, mercy);
}),
);
@@ -162,7 +162,7 @@ App.UI.SlaveInteract.killSlave = function(slave) {
links.push(App.UI.DOM.disabledLink(combatLinkText, disableReasons));
} else {
links.push(App.UI.DOM.link(combatLinkText, () => {
- App.UI.DOM.refresh(linksDiv, combat);
+ App.UI.DOM.replace(linksDiv, combat);
}));
}
@@ -463,7 +463,7 @@ App.UI.SlaveInteract.killSlave = function(slave) {
}
if (relationshipTarget) {
- if (getSlave(relationshipTarget).fetish !== "mindbroken") { // TODO: can mindbroken slaves have relationships?
+ if (getSlave(relationshipTarget).fetish !== "mindbroken") {
const subDiv = document.createElement("div");
const target = getSlave(relationshipTarget);
diff --git a/src/js/utilsDOM.js b/src/js/utilsDOM.js
index 1d4ab7a692dcbf311591b17218d19df44bb810f5..e8fc2a1033753282a251d1c6d230141192ed43ea 100644
--- a/src/js/utilsDOM.js
+++ b/src/js/utilsDOM.js
@@ -172,46 +172,39 @@ App.UI.DOM.linkReplace = function(linkText, newContent) {
};
/**
- * @param {string} selector for jQuery
- * @param {JQuery.Node} newContent
- */
-App.UI.DOM.replace = function(selector, newContent) {
- $(selector).empty().append(newContent);
-};
-
-/**
- * Refreshes a given element with the given text or node.
+ * Replaces a given element with the given text or node.
*
- * @param {HTMLElement|DocumentFragment} el The element to be refreshed.
- * @param {string|HTMLElement|DocumentFragment|function():HTMLElement} replacement The text or node to refresh with. Can be a function returning a node.
+ * @param {HTMLElement|DocumentFragment} el The element to be replaced.
+ * @param {string|HTMLElement|DocumentFragment|function():HTMLElement} newContent The text or node to replace with. Can be a function returning a node.
*
* @example
* const div = document.createElement("div");
* const text = `Any text, including template literals`;
* div.append(App.UI.DOM.link("Link text", () => { // this link will be replaced with the given text
- * App.UI.DOM.refresh(div, text);
+ * App.UI.DOM.replace(div, text);
* }));
*
- * function test() {
+ * function example() {
* const div = document.createElement("div");
- * div.append(App.UI.DOM.link("Link text", () => { // this will cause div to be refreshed with any new options or changes
- * App.UI.DOM.refresh(div, test); // if function returns a DocumentFragment, use refresh(div, test());
- * }));
+ * let condition = false;
+ * if (condition) {
+ * div.append(App.UI.DOM.link("Link text", () => { // this link will then be replaced with second link
+ * let text = `Some text`;
+ * App.UI.DOM.replace(div, example);
+ * }));
+ * } else {
+ * div.append(App.UI.DOM.link("Different link text", () => { // this link will be replaced with first link
+ let text = `Some other text`;
+ * App.UI.DOM.replace(div, example);
+ * }));
+ * }
* return div;
* }
*
* @see For more examples, see killSlave.js and pit.js
*/
-App.UI.DOM.refresh = function(el, replacement) {
- if (typeof replacement === 'function') {
- $(el).empty().append(replacement());
- } else {
- if (replacement !== '') {
- $(el).empty().append(replacement);
- } else {
- return;
- }
- }
+App.UI.DOM.replace = function(el, newContent) {
+ $(el).empty().append(newContent);
};
/**