From ede2f2c754e2d7065e6f4a3355936ce2e71f6d2b Mon Sep 17 00:00:00 2001
From: ezsh <ezsh.junk@gmail.com>
Date: Fri, 17 May 2019 23:58:18 +0200
Subject: [PATCH] Fix sorting in the head girl suite
Default facilityPassage to passage() in App.UI.SlaveList.listSJFacilitySlaves().
Closes #740.
---
src/js/slaveListing.js | 3 ++-
src/uncategorized/arcade.tw | 2 +-
src/uncategorized/dairy.tw | 2 +-
src/uncategorized/servantsQuarters.tw | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 2b1f75997c8..921db9d1c9e 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -380,13 +380,14 @@ App.UI.SlaveList.sortingLinks = function (passage) {
/**
* Standard tabs for a facility with a single job (SJ)
* @param {App.Entity.Facilities.Facility} facility
- * @param {string} facilityPassage
+ * @param {string} [facilityPassage]
* @param {boolean} [showTransfersTab=false]
* @param {{assign: string, remove: string, transfer: (string| undefined)}} [tabCaptions]
* @returns {string}
*/
App.UI.SlaveList.listSJFacilitySlaves = function (facility, facilityPassage, showTransfersTab = false, tabCaptions = undefined) {
const V = State.variables;
+ facilityPassage = facilityPassage || passage();
tabCaptions = tabCaptions || {
assign: 'Assign a slave',
remove: 'Remove a slave',
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index b7688d666ae..d4d4a0f7460 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -137,6 +137,6 @@ $arcadeNameCaps
<br><br>
-<<print App.UI.SlaveList.listSJFacilitySlaves(App.Entity.facilities.arcade, passage())>>
+<<print App.UI.SlaveList.listSJFacilitySlaves(App.Entity.facilities.arcade)>>
<br><br>Rename $arcadeName: <<textbox "$arcadeName" $arcadeName "Arcade">> //Use a noun or similar short phrase//
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index dbab451e003..bb3a9a78771 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -527,6 +527,6 @@ $dairyNameCaps
<</if>>
<br><br>
-<<print App.UI.SlaveList.listSJFacilitySlaves(_facility, passage())>>
+<<print App.UI.SlaveList.listSJFacilitySlaves(_facility)>>
<br><br>Rename $dairyName: <<textbox "$dairyName" $dairyName "Dairy">> //Use a noun or similar short phrase//
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index 000cd2699d3..5e7398e1ab1 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -120,6 +120,6 @@ $servantsQuartersNameCaps
<br><br>
-<<print App.UI.SlaveList.listSJFacilitySlaves(_facility, passage())>>
+<<print App.UI.SlaveList.listSJFacilitySlaves(_facility)>>
<br><br>Rename $servantsQuartersName: <<textbox "$servantsQuartersName" $servantsQuartersName "Servants' Quarters">> //Use a noun or similar short phrase//
--
GitLab