From eeec6fc6fa523df525820c74ed0e3c91cd320f15 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Tue, 5 May 2020 14:11:06 -0700
Subject: [PATCH] Move generateLinksStrip to App.UI.DOM
---
src/interaction/slaveInteract.js | 18 ++----------------
src/js/utilsDOM.js | 18 ++++++++++++++++++
2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index 7c662287a64..fcd79e268e1 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -159,7 +159,7 @@ App.UI.SlaveInteract.fucktoyPref = function(slave) {
return link;
}
- el.appendChild(App.UI.SlaveInteract.generateLinksStrip(links, generateLink));
+ el.appendChild(App.UI.DOM.generateLinksStrip(links.map(generateLink)));
return jQuery('#fucktoypref').empty().append(el);
};
@@ -300,7 +300,7 @@ App.UI.SlaveInteract.work = function(slave) {
appendLink(`Middle Class`, 2, true);
appendLink(`Upper Class`, 3, true);
appendLink(`Millionaires Class`, 4, true);
- div.appendChild(App.UI.SlaveInteract.generateLinksStrip(links, generateLink));
+ div.appendChild(App.UI.DOM.generateLinksStrip(links.map(generateLink)));
el.append(div);
}
@@ -3370,17 +3370,3 @@ App.UI.SlaveInteract.refreshAll = function(slave) {
App.UI.SlaveInteract.smartSettings(slave);
App.UI.SlaveInteract.orgasm(slave);
};
-
-App.UI.SlaveInteract.generateLinksStrip = function(links, mapper) {
- const strip = document.createElement('ul');
- strip.className = "choicesStrip";
-
- const elems = mapper ? links.map(mapper) : links;
- elems.reduce((list, lnk) => {
- const li = document.createElement("li");
- li.appendChild(lnk);
- list.appendChild(li);
- return list;
- }, strip);
- return strip;
-};
diff --git a/src/js/utilsDOM.js b/src/js/utilsDOM.js
index b181cd3a8de..967c6d1587e 100644
--- a/src/js/utilsDOM.js
+++ b/src/js/utilsDOM.js
@@ -338,3 +338,21 @@ $(document).on(":passagestart", event => {
event.content.classList.add("tooltipsEnabled");
}
});
+
+/**
+ * Show a list of links (or disabled links) as a delimited strip
+ * @param {Node[]} links
+ * @returns {HTMLUListElement}
+ */
+App.UI.DOM.generateLinksStrip = function(links) {
+ const strip = document.createElement('ul');
+ strip.className = "choicesStrip";
+
+ links.reduce((list, lnk) => {
+ const li = document.createElement("li");
+ li.appendChild(lnk);
+ list.appendChild(li);
+ return list;
+ }, strip);
+ return strip;
+};
--
GitLab