From 7597214ec423893ab1a01521040a26956e4ad88f Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sun, 20 Dec 2020 23:55:29 -0500
Subject: [PATCH] ui tweaks
---
src/interaction/siWardrobe.js | 207 +++++++++++++++++-----------------
1 file changed, 105 insertions(+), 102 deletions(-)
diff --git a/src/interaction/siWardrobe.js b/src/interaction/siWardrobe.js
index fc9447c7e0d..a69a342215e 100644
--- a/src/interaction/siWardrobe.js
+++ b/src/interaction/siWardrobe.js
@@ -4,32 +4,117 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
him,
his,
} = getPronouns(slave);
- const frag = new DocumentFragment();
- frag.append(clothes());
- if (slave.fuckdoll === 0) {
- frag.append(mask());
- frag.append(mouth());
- frag.append(armAccessory());
- frag.append(shoes());
- frag.append(legAccessory());
- frag.append(bellyAccessory());
- frag.append(buttplug());
- frag.append(buttplugAttachment());
- frag.append(vaginalAccessory());
- frag.append(vaginalAttachment());
- frag.append(dickAccessory());
- frag.append(chastity());
+ let filters = {};
+ const el = document.createElement("span");
+ el.id = "content";
+ el.append(contents())
+ return el;
+
+
+ function contents() {
+ const frag = new DocumentFragment();
+ if (slave.fuckdoll === 0) {
+ frag.append(filtersDOM());
+ frag.append(clothes());
+ frag.append(mask());
+ frag.append(mouth());
+ frag.append(armAccessory());
+ frag.append(shoes());
+ frag.append(legAccessory());
+ frag.append(bellyAccessory());
+ frag.append(buttplug());
+ frag.append(buttplugAttachment());
+ frag.append(vaginalAccessory());
+ frag.append(vaginalAttachment());
+ frag.append(dickAccessory());
+ frag.append(chastity());
+ } else {
+ frag.append(clothes());
+ }
+
+ App.UI.DOM.appendNewElement("h3", frag, `Shopping`);
+ frag.append(shopping());
+
+ return frag;
}
- App.UI.DOM.appendNewElement("h3", frag, `Shopping`);
- frag.append(shopping());
+ function filtersDOM() {
+ const el = document.createElement("p");
+ el.append("Filters: ");
+
+ const niceFilters = new Map([
+ [false, "Nice"],
+ [true, "Harsh"],
+ ]);
+ let linkArray = [];
+ for (const [bool, string] of niceFilters) {
+ if (filters.harsh === bool) {
+ linkArray.push(
+ App.UI.DOM.disabledLink(
+ string,
+ ["Currently selected"]
+ )
+ );
+ } else {
+ linkArray.push(
+ App.UI.DOM.link(
+ string,
+ () => {
+ filters.harsh = bool;
+ refresh();
+ }
+ )
+ );
+ }
+ }
+ App.UI.DOM.appendNewElement("span", el, App.UI.DOM.generateLinksStrip(linkArray));
+
+ el.append(" / ");
+ const exposureFilters = new Map([
+ [0, "Modest"],
+ [1, "Normal"],
+ [2, "Slutty"],
+ [3, "Humiliating"],
+ [4, "Practically nude"],
+ ]);
+ linkArray = [];
+ for (const [num, string] of exposureFilters) {
+ if (filters.exposure === num) {
+ linkArray.push(
+ App.UI.DOM.disabledLink(
+ string,
+ ["Currently selected"]
+ )
+ );
+ } else {
+ linkArray.push(
+ App.UI.DOM.link(
+ string,
+ () => {
+ filters.exposure = num;
+ refresh();
+ }
+ )
+ );
+ }
+ }
+ App.UI.DOM.appendNewElement("span", el, App.UI.DOM.generateLinksStrip(linkArray));
+ el.append(" / ");
- return frag;
+ App.UI.DOM.appendNewElement("span", el, App.UI.DOM.link(
+ "Reset Filters",
+ () => {
+ filters = {};
+ refresh();
+ }
+ )); // clear filters
+ App.UI.DOM.appendNewElement("hr", el);
+ return el;
+ }
function clothes() {
const el = document.createElement('div');
let links;
- let filters = {};
if (slave.fuckdoll === 0) {
// First Row
let label = document.createElement('div');
@@ -46,8 +131,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
label.appendChild(generateRows(choiceOptionsArray, "clothes", false));
}
el.appendChild(label);
- const filtersDiv = App.UI.DOM.appendNewElement("div", el, filtersDOM());
- filtersDiv.id = "filters";
links = App.UI.DOM.appendNewElement("div", el, clothingSelection());
links.id = "clothing-selection";
}
@@ -77,79 +160,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
return el;
- function filtersDOM() {
- const el = new DocumentFragment();
- el.append("Filter clothing: ");
-
- const niceFilters = new Map([
- [false, "Nice"],
- [true, "Harsh"],
- ]);
- let linkArray = [];
- for (const [bool, string] of niceFilters) {
- if (filters.harsh === bool) {
- linkArray.push(
- App.UI.DOM.disabledLink(
- string,
- ["Currently selected"]
- )
- );
- } else {
- linkArray.push(
- App.UI.DOM.link(
- string,
- () => {
- filters.harsh = bool;
- refresh();
- }
- )
- );
- }
- }
- App.UI.DOM.appendNewElement("span", el, App.UI.DOM.generateLinksStrip(linkArray));
-
- el.append(" / ");
- const exposureFilters = new Map([
- [0, "Modest"],
- [1, "Normal"],
- [2, "Slutty"],
- [3, "Humiliating"],
- [4, "Practically nude"],
- ]);
- linkArray = [];
- for (const [num, string] of exposureFilters) {
- if (filters.exposure === num) {
- linkArray.push(
- App.UI.DOM.disabledLink(
- string,
- ["Currently selected"]
- )
- );
- } else {
- linkArray.push(
- App.UI.DOM.link(
- string,
- () => {
- filters.exposure = num;
- refresh();
- }
- )
- );
- }
- }
- App.UI.DOM.appendNewElement("span", el, App.UI.DOM.generateLinksStrip(linkArray));
- el.append(" / ");
-
- App.UI.DOM.appendNewElement("span", el, App.UI.DOM.link(
- "Reset Filters",
- () => {
- filters = {};
- refresh();
- }
- )); // clear filters
- return el;
- }
-
function clothingSelection() {
const el = new DocumentFragment();
let array = [];
@@ -213,12 +223,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
return el;
}
-
- function refresh() {
- jQuery("#filters").empty().append(filtersDOM());
- jQuery("#clothing-selection").empty().append(clothingSelection());
- jQuery("#collar-selection").empty().append(collar());
- }
}
function mask() {
@@ -829,8 +833,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function refresh() {
- App.Art.refreshSlaveArt(slave, 3, "art-frame");
- jQuery("#content-appearance").empty().append(App.UI.SlaveInteract.wardrobe(slave));
+ jQuery("#content").empty().append(contents());
}
/**
--
GitLab