From ebc6bcf1ab1ed4ce62d5dd5baab6f8371ab26a0f Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 23 Feb 2020 21:00:11 -0500
Subject: [PATCH] move category argument later as prep for being op
---
src/js/slaveInteract.js | 2 +-
src/js/wardrobeUse.js | 52 ++++++++++++++++++++---------------------
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/js/slaveInteract.js b/src/js/slaveInteract.js
index c0788602d0c..df05cf9f9c2 100644
--- a/src/js/slaveInteract.js
+++ b/src/js/slaveInteract.js
@@ -2140,7 +2140,7 @@ App.UI.SlaveInteract.curatives = function(slave) {
}}}}}
-App.UI.SlaveInteract.generateRows = function(array, category, slave, accessCheck = false) { // category should be in the form of slave.category, the thing we want to update.
+App.UI.SlaveInteract.generateRows = function(array, slave, category, accessCheck = false) { // category should be in the form of slave.category, the thing we want to update.
let row = document.createElement('span');
for (let i = 0; i < array.length; i++) {
let link;
diff --git a/src/js/wardrobeUse.js b/src/js/wardrobeUse.js
index 07d35ee3387..06b618bba34 100644
--- a/src/js/wardrobeUse.js
+++ b/src/js/wardrobeUse.js
@@ -24,7 +24,7 @@ App.UI.Wardrobe.clothes = function(slave) {
if (slave.clothes !== `choosing her own clothes`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: `Let ${him} choose`, updateSlave: {clothes: `choosing her own clothes`, choosesOwnClothes: 1}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, "clothes", slave, false));
+ label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "clothes", false));
}
el.appendChild(label);
@@ -66,14 +66,14 @@ App.UI.Wardrobe.clothes = function(slave) {
let links = document.createElement('div');
links.className = "choices";
links.append(`Nice: `);
- links.appendChild(App.UI.SlaveInteract.generateRows(niceOptionsArray, "clothes", slave, true));
+ links.appendChild(App.UI.SlaveInteract.generateRows(niceOptionsArray, slave, "clothes", true));
el.appendChild(links);
// Harsh options
links = document.createElement('div');
links.className = "choices";
links.append(`Harsh: `);
- links.appendChild(App.UI.SlaveInteract.generateRows(harshOptionsArray, "clothes", slave, true));
+ links.appendChild(App.UI.SlaveInteract.generateRows(harshOptionsArray, slave, "clothes", true));
el.appendChild(links);
return jQuery('#clothes').empty().append(el);
@@ -98,7 +98,7 @@ App.UI.Wardrobe.collar = function(slave) {
if (slave.collar !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: `None`, updateSlave: {collar: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, "collar", slave, false));
+ label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "collar", false));
}
el.appendChild(label);
@@ -138,14 +138,14 @@ App.UI.Wardrobe.collar = function(slave) {
let links = document.createElement('div');
links.className = "choices";
links.append(`Nice: `);
- links.appendChild(App.UI.SlaveInteract.generateRows(niceOptionsArray, "collar", slave, true));
+ links.appendChild(App.UI.SlaveInteract.generateRows(niceOptionsArray, slave, "collar", true));
el.appendChild(links);
// Harsh options
links = document.createElement('div');
links.className = "choices";
links.append(`Harsh: `);
- links.appendChild(App.UI.SlaveInteract.generateRows(harshOptionsArray, "collar", slave, true));
+ links.appendChild(App.UI.SlaveInteract.generateRows(harshOptionsArray, slave, "collar", true));
el.appendChild(links);
return jQuery('#collar').empty().append(el);
@@ -171,7 +171,7 @@ App.UI.Wardrobe.armAccessory = function(slave) {
// Choose her own
if (slave.armAccessory !== "none") {
array.push({text: `None`, updateSlave: {armAccessory: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(array, "armAccessory", slave, false));
+ label.appendChild(App.UI.SlaveInteract.generateRows(array, slave, "armAccessory", false));
}
el.appendChild(label);
@@ -182,7 +182,7 @@ App.UI.Wardrobe.armAccessory = function(slave) {
{text: "Hand gloves", updateSlave: {armAccessory: "hand gloves"}},
{text: "Elbow gloves", updateSlave: {armAccessory: "elbow gloves"}}
];
- links.appendChild(App.UI.SlaveInteract.generateRows(array, "armAccessory", slave, false));
+ links.appendChild(App.UI.SlaveInteract.generateRows(array, slave, "armAccessory", false));
el.appendChild(links);
return jQuery('#armAccessory').empty().append(el);
@@ -214,7 +214,7 @@ App.UI.Wardrobe.shoes = function(slave) {
if (slave.shoes !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: `None`, updateSlave: {shoes: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, "shoes", slave, false));
+ label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "shoes", false));
}
*/
el.appendChild(label);
@@ -239,7 +239,7 @@ App.UI.Wardrobe.shoes = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, "shoes", slave, true));
+ links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "shoes", true));
el.appendChild(links);
return jQuery('#shoes').empty().append(el);
@@ -270,7 +270,7 @@ App.UI.Wardrobe.legAccessory = function(slave) {
// Choose her own
if (slave.legAccessory !== "none") {
array.push({text: `None`, updateSlave: {legAccessory: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(array, "legAccessory", slave, false));
+ label.appendChild(App.UI.SlaveInteract.generateRows(array, slave, "legAccessory", false));
}
el.appendChild(label);
@@ -281,7 +281,7 @@ App.UI.Wardrobe.legAccessory = function(slave) {
{text: "Short stockings", updateSlave: {legAccessory: "short stockings"}},
{text: "Long stockings", updateSlave: {legAccessory: "long stockings"}}
];
- links.appendChild(App.UI.SlaveInteract.generateRows(array, "legAccessory", slave, false));
+ links.appendChild(App.UI.SlaveInteract.generateRows(array, slave, "legAccessory", false));
el.appendChild(links);
return jQuery('#legAccessory').empty().append(el);
@@ -331,7 +331,7 @@ App.UI.Wardrobe.bellyAccessory = function(slave) {
// Choose her own
if (slave.bellyAccessory !== `none`) {
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, "bellyAccessory", slave, false));
+ label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "bellyAccessory", false));
}
el.appendChild(label);
@@ -339,7 +339,7 @@ App.UI.Wardrobe.bellyAccessory = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, "bellyAccessory", slave, true));
+ links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "bellyAccessory", true));
el.appendChild(links);
return jQuery('#bellyAccessory').empty().append(el);
@@ -368,7 +368,7 @@ App.UI.Wardrobe.buttplug = function(slave) {
if (slave.buttplug !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: `None`, updateSlave: {buttplug: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, "buttplug", slave, false));
+ label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "buttplug", false));
}
el.appendChild(label);
@@ -396,7 +396,7 @@ App.UI.Wardrobe.buttplug = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, "buttplug", slave, true));
+ links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "buttplug", true));
el.appendChild(links);
return jQuery('#buttplug').empty().append(el);
@@ -427,7 +427,7 @@ App.UI.Wardrobe.buttplugAttachment = function(slave) {
if (slave.buttplugAttachment !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: `None`, updateSlave: {buttplugAttachment: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, "buttplugAttachment", slave, false));
+ label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "buttplugAttachment", false));
}
el.appendChild(label);
@@ -455,7 +455,7 @@ App.UI.Wardrobe.buttplugAttachment = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, "buttplugAttachment", slave, true));
+ links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "buttplugAttachment", true));
el.appendChild(links);
return jQuery('#buttplugAttachment').empty().append(el);
@@ -484,7 +484,7 @@ App.UI.Wardrobe.vaginalAccessory = function(slave) {
if (slave.vaginalAccessory !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: `None`, updateSlave: {vaginalAccessory: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, "vaginalAccessory", slave, false));
+ label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "vaginalAccessory", false));
}
el.appendChild(label);
@@ -512,7 +512,7 @@ App.UI.Wardrobe.vaginalAccessory = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, "vaginalAccessory", slave, true));
+ links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "vaginalAccessory", true));
el.appendChild(links);
return jQuery('#vaginalAccessory').empty().append(el);
@@ -543,7 +543,7 @@ App.UI.Wardrobe.vaginalAttachment = function(slave) {
if (slave.vaginalAttachment !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: `None`, updateSlave: {vaginalAttachment: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, "vaginalAttachment", slave, false));
+ label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "vaginalAttachment", false));
}
el.appendChild(label);
@@ -571,7 +571,7 @@ App.UI.Wardrobe.vaginalAttachment = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, "vaginalAttachment", slave, true));
+ links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "vaginalAttachment", true));
el.appendChild(links);
return jQuery('#vaginalAttachment').empty().append(el);
@@ -600,7 +600,7 @@ App.UI.Wardrobe.dickAccessory = function(slave) {
if (slave.dickAccessory !== `none`) {
let choiceOptionsArray = [];
choiceOptionsArray.push({text: `None`, updateSlave: {dickAccessory: `none`}});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, "dickAccessory", slave, false));
+ label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "dickAccessory", false));
}
el.appendChild(label);
@@ -628,7 +628,7 @@ App.UI.Wardrobe.dickAccessory = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, "dickAccessory", slave, true));
+ links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "dickAccessory", true));
el.appendChild(links);
return jQuery('#dickAccessory').empty().append(el);
@@ -685,7 +685,7 @@ App.UI.Wardrobe.chastity = function(slave) {
chastityVagina: 0
}
});
- label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, "chastity", slave, false));
+ label.appendChild(App.UI.SlaveInteract.generateRows(choiceOptionsArray, slave, "chastity", false));
}
el.appendChild(label);
@@ -713,7 +713,7 @@ App.UI.Wardrobe.chastity = function(slave) {
// Options
let links = document.createElement('div');
links.className = "choices";
- links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, "chastity", slave, true));
+ links.appendChild(App.UI.SlaveInteract.generateRows(optionsArray, slave, "chastity", true));
el.appendChild(links);
return jQuery('#chastity').empty().append(el);
--
GitLab