From 2e464c2efb4a8745ba4a2681dd99852215491d98 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Fri, 29 Mar 2019 22:42:34 +0100
Subject: [PATCH] minor cleaning
---
src/js/slaveGenerationJS.js | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/js/slaveGenerationJS.js b/src/js/slaveGenerationJS.js
index 017d09f4992..f9359ebaf05 100644
--- a/src/js/slaveGenerationJS.js
+++ b/src/js/slaveGenerationJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
window.nationalityToRace = /** @param {App.Entity.SlaveState} slave */ function nationalityToRace(slave) {
slave.race = hashChoice(setup.raceSelector[slave.nationality] || setup.raceSelector[""]);
};
@@ -14,7 +13,7 @@ window.raceToNationality = /** @param {App.Entity.SlaveState} slave */ function
}
/* No success after 100 attempts, so just randomize according to race */
if (setup.raceSelector[slave.nationality] && !(slave.race in setup.raceSelector[slave.nationality]) && i === 100) {
- slave.nationality = hashChoice(setup[`${slave.race.toLowerCase().replace(/[ -]/g, '')}Nationalities`]);
+ slave.nationality = hashChoice(setup[`${slave.race.toLowerCase().replace(/[ -]/g, "")}Nationalities`]);
}
};
@@ -25,7 +24,7 @@ window.generateName = function generateName(nationality, race, male, filter) {
(lookup[`${nationality }.${ race}`] || lookup[nationality] ||
(male ? setup.whiteAmericanMaleNames : setup.whiteAmericanSlaveNames)).filter(filter));
/* fallback for males without specific male name sets: return female name */
- if(male && !result) {
+ if (male && !result) {
return generateName(nationality, race, false);
}
return result;
@@ -37,10 +36,10 @@ window.generateSurname = function generateSurname(nationality, race, male, filte
(setup.surnamePoolSelector[`${nationality }.${ race}`] ||
setup.surnamePoolSelector[nationality] ||
setup.whiteAmericanSlaveSurnames).filter(filter));
- if(male) {
+ if (male) {
/* see if we have male equivalent of that surname, and return that if so */
const maleLookup = setup.maleSurnamePoolSelector[`${nationality }.${ race}`] || setup.maleSurnamePoolSelector[nationality];
- if(maleLookup && maleLookup[result]) {
+ if (maleLookup && maleLookup[result]) {
return maleLookup[result];
}
}
@@ -60,7 +59,7 @@ window.nationalityToName = /** @param {App.Entity.SlaveState} slave */ function
slave.birthName = generateName(slave.nationality, slave.race, male);
slave.birthSurname = generateSurname(slave.nationality, slave.race, male);
- if(male && isMaleName(slave.birthName, slave.nationality, slave.race) && !V.allowMaleSlaveNames) {
+ if (male && isMaleName(slave.birthName, slave.nationality, slave.race) && !V.allowMaleSlaveNames) {
slave.slaveName = generateName(slave.nationality, slave.race, false);
} else {
slave.slaveName = slave.birthName;
--
GitLab