From e94e70d8577dd45767f546f42a77c83432131e39 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Fri, 29 Mar 2019 22:40:51 +0100
Subject: [PATCH] more template literals
---
src/js/economyJS.js | 2 +-
src/js/familyTreeJS.js | 20 ++++++++---------
src/js/foreachMacroJS.js | 6 ++---
src/js/futureSocietyJS.js | 6 ++---
src/js/hTagMacroJS.js | 6 ++---
src/js/optionsMacro.js | 26 ++++++++++-----------
src/js/rulesAssistantOptions.js | 40 ++++++++++++++++-----------------
src/js/slaveGenerationJS.js | 10 ++++-----
src/js/spanMacroJS.js | 2 +-
9 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 33f09c86e30..5895f47c7c0 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -881,7 +881,7 @@ window.getSlaveCost = function(s) {
}
if (isNaN(cost)) {
- throw new Error('Cost calculation for slave ' + s.slaveName + ' (' + s.ID + ') failed.');
+ throw new Error(`Cost calculation for slave ${ s.slaveName } (${ s.ID }) failed.`);
}
return cost;
};
diff --git a/src/js/familyTreeJS.js b/src/js/familyTreeJS.js
index 9b9f993adb2..4819a4019ca 100644
--- a/src/js/familyTreeJS.js
+++ b/src/js/familyTreeJS.js
@@ -75,7 +75,7 @@ window.renderFamilyTree = function(slaves, filterID) {
chartLayer
.attr('width', chartWidth)
.attr('height', chartHeight)
- .attr('transform', 'translate('+[margin.left, margin.top]+')');
+ .attr('transform', `translate(${[margin.left, margin.top]})`);
}
function runFtreeSim(data) {
@@ -147,7 +147,7 @@ window.renderFamilyTree = function(slaves, filterID) {
} else {
ssym = '?';
}
- return d.name + '('+ssym+')';
+ return `${d.name }(${ssym})`;
})
.attr('dy', 4)
.attr('dx', function(d) { return -(8*d.name.length)/2; })
@@ -177,7 +177,7 @@ window.renderFamilyTree = function(slaves, filterID) {
.attr('y2', function (d) { return d.target.y; });
node
- .attr("transform", function (d) { return "translate(" + d.x + ", " + d.y + ")"; });
+ .attr("transform", function (d) { return `translate(${ d.x }, ${ d.y })`; });
};
simulation.nodes(data.nodes)
@@ -225,7 +225,7 @@ window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
var kids = {};
var fake_pc = {
- slaveName: State.variables.PC.name + '(You)',
+ slaveName: `${State.variables.PC.name }(You)`,
mother: State.variables.PC.mother,
father: State.variables.PC.father,
dick: State.variables.PC.dick,
@@ -311,12 +311,12 @@ window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
} else if(names.length === 2) {
name = names.join(' and ');
} else {
- names[-1] = 'and '+names[-1];
+ names[-1] = `and ${names[-1]}`;
name = names.join(', ');
}
node_lookup[key] = family_graph.nodes.length;
//Outside extant slaves set
- charList.push({ID: key, mother: 0, father: 0, is_mother: true, dick: 0, vagina: 1, slaveName: name+"'s mother"});
+ charList.push({ID: key, mother: 0, father: 0, is_mother: true, dick: 0, vagina: 1, slaveName: `${name}'s mother`});
}
var dkeys = Object.keys(outdads);
@@ -329,12 +329,12 @@ window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
} else if(names.length === 2) {
name = names.join(' and ');
} else {
- names[-1] = 'and '+names[-1];
+ names[-1] = `and ${names[-1]}`;
name = names.join(', ');
}
node_lookup[key] = family_graph.nodes.length;
//Outside extant slaves set
- charList.push({ID: key, mother: 0, father: 0, is_father: true, dick: 1, vagina: -1, slaveName: name+"'s father"});
+ charList.push({ID: key, mother: 0, father: 0, is_father: true, dick: 1, vagina: -1, slaveName: `${name}'s father`});
}
var charHash = {};
@@ -546,7 +546,7 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
slavesAdded[slave.ID] = true;
}
var data = {
- "name": slave.slaveName + (slave.physicalAge?(" (" + slave.physicalAge + ")"):""),
+ "name": slave.slaveName + (slave.physicalAge?(` (${ slave.physicalAge })`):""),
"class": slave.genes,
"textClass": (activeSlaveId === slave.ID)?"emphasis":"",
"marriages": [],
@@ -586,7 +586,7 @@ window.updateFamilyTree = function(activeSlave = lastActiveSlave, slaves = lastS
var spouse = getSlave(key, (slaves.genes === "XX")?"unknownXY":(slaves.genes === "XY")?"unknownXX":"unknown");
var spouseName;
if (spouse.ID !== slave.ID){
- spouseName = spouse.slaveName + (spouse.physicalAge?(" (" + spouse.physicalAge + ")"):"");
+ spouseName = spouse.slaveName + (spouse.physicalAge?(` (${ spouse.physicalAge })`):"");
} else {
spouseName = (spouse.ID === -1)?"(yourself)":"(themselves)";
}
diff --git a/src/js/foreachMacroJS.js b/src/js/foreachMacroJS.js
index ea5e0afcd3f..5aa54d90562 100644
--- a/src/js/foreachMacroJS.js
+++ b/src/js/foreachMacroJS.js
@@ -31,15 +31,15 @@ Macro.add('foreach', {
// We don't check for "instanceof Array" to also be able to pass arguments or other strange objects
if(typeof resultLength !== 'number' || (resultLength % 1) !== 0) {
- return this.error("bad evaluation: '" + result + "' is not an array or array-like object");
+ return this.error(`bad evaluation: '${ result }' is not an array or array-like object`);
}
if(resultLength > Config.macros.maxLoopIterations) {
- return this.error('Array too large for maxLoopIterations (' + resultLength + ' > ' + Config.macros.maxLoopIterations + ')');
+ return this.error(`Array too large for maxLoopIterations (${ resultLength } > ${ Config.macros.maxLoopIterations })`);
}
if(!new RegExp(`^(${Patterns.variable})$`).test(variable)) {
- return this.error('not a variable identifier: ' + variable);
+ return this.error(`not a variable identifier: ${ variable}`);
}
if(resultLength <= 0) {
diff --git a/src/js/futureSocietyJS.js b/src/js/futureSocietyJS.js
index 6978059a94e..bd005f0b772 100644
--- a/src/js/futureSocietyJS.js
+++ b/src/js/futureSocietyJS.js
@@ -11,9 +11,9 @@ window.FutureSocieties = (function() {
function removeFS(FS) {
const V = State.variables;
const arcology = V.arcologies[0];
- const FSDecoration = FS + "Decoration";
- const FSSMR = FS + "SMR";
- let FSLaw = FS + "Law";
+ const FSDecoration = `${FS }Decoration`;
+ const FSSMR = `${FS }SMR`;
+ let FSLaw = `${FS }Law`;
if (arcology[FS] === undefined) {
console.log(`ERROR: bad FS reference, $arcologies[0].${FS} not defined`);
return;
diff --git a/src/js/hTagMacroJS.js b/src/js/hTagMacroJS.js
index 64681ad4b2d..a0908716ab2 100644
--- a/src/js/hTagMacroJS.js
+++ b/src/js/hTagMacroJS.js
@@ -20,7 +20,7 @@ Macro.add('htag', {
let htag = 'div';
let attributes;
function munge (val, key) {
- return key + '="' + val + '"';
+ return `${key }="${ val }"`;
}
if (1 > this.args.length)
@@ -30,11 +30,11 @@ Macro.add('htag', {
if ("object" === typeof this.args[0])
attributes = $.map(this.args[0], munge).join(" ");
else
- attributes = 'id="' + String(this.args[0]).trim() + '"';
+ attributes = `id="${ String(this.args[0]).trim() }"`;
if (Config.debug)
this.debugView.modes({block: true});
- jQuery('<' + htag + ' ' + attributes + ' />')
+ jQuery(`<${ htag } ${ attributes } />`)
.wiki(payload)
.appendTo(this.output);
}
diff --git a/src/js/optionsMacro.js b/src/js/optionsMacro.js
index 25de71e2e3c..5c0b7940a32 100644
--- a/src/js/optionsMacro.js
+++ b/src/js/optionsMacro.js
@@ -43,9 +43,9 @@ Macro.add('options', {
if (currentOption === undefined)
currentOption = false;
if (this.payload[0].args.full.startsWith("State.temporary.")) {
- variable = "_" + this.payload[0].args.full.split(' ',1)[0].substring("State.temporary.".length);
+ variable = `_${ this.payload[0].args.full.split(' ',1)[0].substring("State.temporary.".length)}`;
} else if (this.payload[0].args.full.startsWith("State.variables.")) {
- variable = "$" + this.payload[0].args.full.split(' ',1)[0].substring("State.variables.".length);
+ variable = `$${ this.payload[0].args.full.split(' ',1)[0].substring("State.variables.".length)}`;
} else {
console.log(this.payload[0].args.full);
throw new Error("First parameter to 'options' must be a variable");
@@ -145,18 +145,18 @@ Macro.add('options', {
output += this.payload[i].contents.trim();
} else {
var extraComment = args[hasComparitor ? 4: 3];
- extraComment = extraComment ? ' ' + extraComment : '';
+ extraComment = extraComment ? ` ${ extraComment}` : '';
// We use a very crude heuristic for styling 'Enable'
// and 'Disable' buttons differently.
const isEnableOption = argText && (argText.startsWith("Enable") || argText === "Yes" || argText.startsWith("Allow"));
const isDisableOption = argText && (argText.startsWith("Disable") || argText === "No" || argText.startsWith("Deny"));
- var className = "optionMacroOption " + (isEnableOption ? "optionMacroEnable" : isDisableOption ? "optionMacroDisable" : "");
+ var className = `optionMacroOption ${ isEnableOption ? "optionMacroEnable" : isDisableOption ? "optionMacroDisable" : ""}`;
if (found_index !== i || hasMultipleOptionsWithSameValue) {
var onClickChange = args[hasComparitor ? 3 : 2];
- onClickChange = onClickChange ? ', ' + onClickChange : '';
- output += '<span class="' + className + '">[[' + argText + extraComment + '|' + passageName + "][" + variable + " = " + JSON.stringify(args[hasComparitor ? 1 : 0]) + onClickChange + "]]" + "</span>";
+ onClickChange = onClickChange ? `, ${ onClickChange}` : '';
+ output += `<span class="${ className }">[[${ argText }${extraComment }|${ passageName }][${ variable } = ${ JSON.stringify(args[hasComparitor ? 1 : 0]) }${onClickChange }]]` + `</span>`;
} else if (showSelectedOption) {
- output +='<span class="optionMacroSelected ' + className + '">' + argText + extraComment + '</span>';
+ output +=`<span class="optionMacroSelected ${ className }">${ argText }${extraComment }</span>`;
}
}
} else if (this.payload[i].name === 'comment') {
@@ -164,14 +164,14 @@ Macro.add('options', {
}
}
jQuery(this.output).wiki(
- '<span class="optionMacro ' + (currentOptionIsNumber ? 'optionMacroNumber' : '') + '">' +
- '<span class="optionDescription">' + title + ' ' + description + "</span>" +
- '<span class="optionValue">' + output + "</span>" +
- (comment ? '<span class="optionComment">//' + comment + "//</span>" : '') +
- '</span>');
+ `<span class="optionMacro ${ currentOptionIsNumber ? 'optionMacroNumber' : '' }">` +
+ `<span class="optionDescription">${ title } ${ description }</span>` +
+ `<span class="optionValue">${ output }</span>${
+ comment ? '<span class="optionComment">//' + comment + "//</span>" : ''
+ }</span>`);
}
catch (ex) {
- return this.error('bad options expression: ' + ex.message);
+ return this.error(`bad options expression: ${ ex.message}`);
}
}
});
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index e476f2814d6..1b54156af26 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -167,7 +167,7 @@ window.rulesAssistantOptions = (function() {
// it can be "bound" to a variable by setting its "onchange" method
class EditorWithShortcuts extends Element {
constructor(prefix, data=[], editor=false, ...args) {
- super(prefix + ": ", editor, ...args);
+ super(`${prefix }: `, editor, ...args);
this.selectedItem = null;
data.forEach(item => this.appendChild(new ListItem(...item)));
}
@@ -199,9 +199,9 @@ window.rulesAssistantOptions = (function() {
setValue(what) {
if (this.value.tagName === "INPUT")
- this.value.value = ""+what;
+ this.value.value = `${what}`;
else
- this.value.innerHTML = ""+what;
+ this.value.innerHTML = `${what}`;
}
getData(what) {
@@ -305,7 +305,7 @@ window.rulesAssistantOptions = (function() {
render(label) {
const elem = document.createElement("div");
const lelem = document.createElement("em");
- lelem.innerText = label + ": ";
+ lelem.innerText = `${label }: `;
elem.appendChild(lelem);
return elem;
}
@@ -432,7 +432,7 @@ window.rulesAssistantOptions = (function() {
V.defaultRules.push(rule);
reload(this.root);
} catch (e) {
- alert("Couldn't import that rule:\n" + e.message);
+ alert(`Couldn't import that rule:\n${ e.message}`);
}
}
}
@@ -706,7 +706,7 @@ window.rulesAssistantOptions = (function() {
const min = document.createElement("input");
min.setAttribute("type", "text");
- min.value = "" + data.value[0];
+ min.value = `${ data.value[0]}`;
min.onkeypress = e => { if (returnP(e)) this.setmin(min.value); };
min.onblur = e => this.setmin(min.value);
this.min = min;
@@ -720,7 +720,7 @@ window.rulesAssistantOptions = (function() {
const max = document.createElement("input");
max.setAttribute("type", "text");
- max.value = "" + data.value[1];
+ max.value = `${ data.value[1]}`;
max.onkeypress = e => { if (returnP(e)) this.setmax(max.value); };
max.onblur = e => this.setmax(max.value);
this.max = max;
@@ -745,12 +745,12 @@ window.rulesAssistantOptions = (function() {
setmin(value) {
current_rule.condition.data.value[0] = this.parse(value);
- this.min.value = ""+current_rule.condition.data.value[0];
+ this.min.value = `${current_rule.condition.data.value[0]}`;
}
setmax(value) {
current_rule.condition.data.value[1] = this.parse(value);
- this.max.value = ""+current_rule.condition.data.value[1];
+ this.max.value = `${current_rule.condition.data.value[1]}`;
}
info(attribute) {
@@ -793,11 +793,11 @@ window.rulesAssistantOptions = (function() {
}
info(attribute) {
- return "Insert a valid JSON array. Known values: " + {
+ return `Insert a valid JSON array. Known values: ${ {
"fetish": "buttslut, cumslut, masochist, sadist, dom, submissive, boobs, pregnancy, none (AKA vanilla)",
"amp": "Amputated: 1, Not amputated: 0",
"genes": "XX, XY",
- }[attribute];
+ }[attribute]}`;
}
setValue(input) {
@@ -1315,9 +1315,9 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
bellies.push([acc.name, acc.value]);
else if (acc.fs === "repopulation" && V.arcologies[0].FSRepopulationFocus !== "unset")
- bellies.push([acc.name + " (FS)", acc.value]);
+ bellies.push([`${acc.name } (FS)`, acc.value]);
else if (acc.rs === "boughtBelly" && V.clothesBoughtBelly === 1)
- bellies.push([acc.name + " (Purchased)", acc.value]);
+ bellies.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Corsetage", bellies);
this.setValue(current_rule.set.bellyAccessory);
@@ -1359,7 +1359,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Vaginal accessories for virgins", accs);
this.setValue(current_rule.set.virginAccessory);
@@ -1374,7 +1374,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Vaginal accessories for anal virgins", accs);
this.setValue(current_rule.set.aVirginAccessory);
@@ -1389,7 +1389,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyBigDildos" && V.toysBoughtDildos === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Vaginal accessories for other slaves", accs);
this.setValue(current_rule.set.vaginalAccessory);
@@ -1404,7 +1404,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyVaginalAttachments" && V.toysBoughtVaginalAttachments === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Vaginal attachments for slaves with vaginal accessories", accs);
this.setValue(current_rule.set.vaginalAttachment);
@@ -1461,7 +1461,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Buttplugs for anal virgins", accs);
this.setValue(current_rule.set.aVirginButtplug);
@@ -1476,7 +1476,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyBigPlugs" && V.toysBoughtButtPlugs === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Buttplugs for other slaves", accs);
this.setValue(current_rule.set.buttplug);
@@ -1491,7 +1491,7 @@ window.rulesAssistantOptions = (function() {
if (acc.fs === undefined && acc.rs === undefined)
accs.push([acc.name, acc.value]);
else if (acc.rs === "buyTails" && V.toysBoughtButtPlugTails === 1)
- accs.push([acc.name + " (Purchased)", acc.value]);
+ accs.push([`${acc.name } (Purchased)`, acc.value]);
});
super("Buttplug attachments for slaves with buttplugs", accs);
this.setValue(current_rule.set.buttplugAttachment);
diff --git a/src/js/slaveGenerationJS.js b/src/js/slaveGenerationJS.js
index d87b6c35d48..017d09f4992 100644
--- a/src/js/slaveGenerationJS.js
+++ b/src/js/slaveGenerationJS.js
@@ -14,7 +14,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`]);
}
};
@@ -22,7 +22,7 @@ window.generateName = function generateName(nationality, race, male, filter) {
filter = filter || _.stubTrue; /* default: allow all */
const lookup = (male ? setup.malenamePoolSelector : setup.namePoolSelector);
const result = jsEither(
- (lookup[nationality + "." + race] || lookup[nationality] ||
+ (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) {
@@ -34,12 +34,12 @@ window.generateName = function generateName(nationality, race, male, filter) {
window.generateSurname = function generateSurname(nationality, race, male, filter) {
filter = filter || _.stubTrue; /* default: allow all */
const result = jsEither(
- (setup.surnamePoolSelector[nationality + "." + race] ||
+ (setup.surnamePoolSelector[`${nationality }.${ race}`] ||
setup.surnamePoolSelector[nationality] ||
setup.whiteAmericanSlaveSurnames).filter(filter));
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];
+ const maleLookup = setup.maleSurnamePoolSelector[`${nationality }.${ race}`] || setup.maleSurnamePoolSelector[nationality];
if(maleLookup && maleLookup[result]) {
return maleLookup[result];
}
@@ -48,7 +48,7 @@ window.generateSurname = function generateSurname(nationality, race, male, filte
};
window.isMaleName = function isMaleName(name, nationality, race) {
- const names = setup.malenamePoolSelector[nationality + "." + race] ||
+ const names = setup.malenamePoolSelector[`${nationality }.${ race}`] ||
setup.malenamePoolSelector[nationality] ||
setup.whiteAmericanMaleNames;
return names && names.includes(name);
diff --git a/src/js/spanMacroJS.js b/src/js/spanMacroJS.js
index 005e6d1c7b6..19eb0a5bef1 100644
--- a/src/js/spanMacroJS.js
+++ b/src/js/spanMacroJS.js
@@ -26,7 +26,7 @@ Macro.add('span', {
Config.debug && this.debugView.modes({block: true});
- jQuery("<span id='" + String(result) + "' />")
+ jQuery(`<span id='${ String(result) }' />`)
.wiki(payload)
.appendTo(this.output);
}
--
GitLab