From bea60ef72dad76dc4c8c63e7eb6f59b5e5c3c643 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 16 May 2021 17:36:02 -0400
Subject: [PATCH] reconnect tail color to salon
---
src/facilities/salon/salonPassage.js | 4 +++-
src/js/salon.js | 11 +++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/facilities/salon/salonPassage.js b/src/facilities/salon/salonPassage.js
index 50d64781d12..676f0ef92bc 100644
--- a/src/facilities/salon/salonPassage.js
+++ b/src/facilities/salon/salonPassage.js
@@ -99,7 +99,7 @@ App.UI.salon = function(slave, cheat = false) {
}
el.append(options.render());
- el.append(App.Medicine.Salon.ears(slave));
+ el.append(App.Medicine.Salon.ears(slave, {cheat: cheat}));
return el;
}
@@ -515,6 +515,8 @@ App.UI.salon = function(slave, cheat = false) {
}
el.append(options.render());
+
+ el.append(App.Medicine.Salon.tail(slave, {cheat: cheat}));
return el;
}
diff --git a/src/js/salon.js b/src/js/salon.js
index 5c8b4841a8e..6cb81b7f72c 100644
--- a/src/js/salon.js
+++ b/src/js/salon.js
@@ -242,7 +242,6 @@ App.Medicine.Salon.ears = function(slave, {primaryEarColor = 0, secondaryEarColo
apply();
};
const container = document.createElement("div");
- container.id = "salon-ears";
container.append(content());
return container;
@@ -335,10 +334,10 @@ App.Medicine.Salon.ears = function(slave, {primaryEarColor = 0, secondaryEarColo
* @param {number|string} [params.primaryTailColor]
* @param {string} [params.secondaryTailColor]
* @param {boolean} [params.cheat]
- * @returns {JQuery<HTMLElement>}
+ * @returns {HTMLElement}
*/
App.Medicine.Salon.tail = function(slave, {primaryTailColor = 0, secondaryTailColor = "", cheat = false} = {}) {
- const frag = new DocumentFragment();
+ const container = document.createElement("div");
let updatePrimary = (newVal) => {
primaryTailColor = newVal.value;
apply();
@@ -350,10 +349,10 @@ App.Medicine.Salon.tail = function(slave, {primaryTailColor = 0, secondaryTailCo
const {His, his} = getPronouns(slave);
if (slave.tail !== "none") {
- frag.append(tailDye());
+ container.append(tailDye());
}
- return jQuery("#salon-tail").empty().append(frag);
+ return container;
function tailDye() {
const frag = new DocumentFragment();
@@ -438,6 +437,6 @@ App.Medicine.Salon.tail = function(slave, {primaryTailColor = 0, secondaryTailCo
function apply() {
App.Art.refreshSlaveArt(slave, 3, "art-frame");
- jQuery("#salon-tail").empty().append(tailDye());
+ jQuery(container).empty().append(tailDye());
}
};
--
GitLab