From 804425f8775efe7416ace02eceb9d7fd07d68da8 Mon Sep 17 00:00:00 2001 From: DCoded <dsoloha@live.com> Date: Tue, 21 May 2019 00:20:56 -0400 Subject: [PATCH] Revert changes to assignJS.js --- src/js/assignJS.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/js/assignJS.js b/src/js/assignJS.js index eeb7ab9d86a..47da3b346cd 100644 --- a/src/js/assignJS.js +++ b/src/js/assignJS.js @@ -319,7 +319,6 @@ window.assignJob = function assignJob(slave, job) { r += `${slave.slaveName} no longer has your personal attention.`; } } - } } V.JobIDArray = resetJobIDArray(); if (idx >= 0) { V.slaves[idx] = slave; } @@ -491,7 +490,7 @@ window.removeJob = function removeJob(slave, assignment) { case "be your agent": case "live with your agent": slave.assignment = "rest"; - const _leaderIndex = V.leaders.findIndex(function (x) { + const _leaderIndex = V.leaders.findIndex(function(x) { return x.ID === slave.ID; }); if (_leaderIndex !== -1) { V.leaders.deleteAt(_leaderIndex); } @@ -555,7 +554,7 @@ window.resetJobIDArray = function resetJobIDArray() { /** * Generates string with links for changing slave assignment */ -App.UI.jobLinks = function () { +App.UI.jobLinks = function() { "use strict"; const facilitiesOrder = [ /* sorted by improvement before work, within improvement in order of progress, within work alphabetical for facilities*/ @@ -620,7 +619,7 @@ App.UI.jobLinks = function () { }(); App.UI.SlaveInteract = { - fucktoyPref: function () { + fucktoyPref: function() { let res = ""; /** @type {App.Entity.SlaveState} */ const slave = State.variables.activeSlave; @@ -651,7 +650,7 @@ App.UI.SlaveInteract = { App.UI.replace('#fucktoypref', res); }, - assignmentBlock: function (blockId) { + assignmentBlock: function(blockId) { let res = App.UI.jobLinks.assignments(-1, undefined, () => { return `<<replace "#assign">>$activeSlave.assignment<</replace>><<replace "#${blockId}">><<= App.UI.SlaveInteract.assignmentBlock("${blockId}")>><<= App.UI.SlaveInteract.fucktoyPref()>><</replace>>`; }); -- GitLab