From 502045ca82b5f55efd34323cef46f2efe3201ba2 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Sun, 14 Apr 2019 22:13:23 -0400
Subject: [PATCH] Removed unnecessary no-undef
---
src/endWeek/saWorkAGloryHole.js | 12 ++++++++++--
src/js/SlaveState.js | 1 -
src/js/assignJS.js | 1 -
src/js/colorModeJS.js | 1 -
src/js/datatypeCleanupJS.js | 2 +-
src/js/eventSelectionJS.js | 1 -
src/js/extendedFamilyModeJS.js | 1 -
src/js/familyTreeJS.js | 3 +--
src/js/foreachMacroJS.js | 1 -
src/js/futureSocietyJS.js | 3 +--
src/js/generateNewSlaveJS.js | 1 -
src/js/hTagMacroJS.js | 1 -
src/js/heroCreator.js | 1 -
src/js/itemAvailability.js | 1 -
src/js/optionsMacro.js | 3 +--
src/js/quickListJS.js | 1 -
src/js/rbuttonJS.js | 1 -
src/js/rulesAssistantOptions.js | 1 -
src/js/slaveCostJS.js | 1 -
src/js/slaveStatsChecker.js | 1 -
src/js/spanMacroJS.js | 1 -
src/js/summaryWidgets.js | 3 ---
src/js/textInput.js | 1 -
src/js/textboxJS.js | 1 -
src/js/utilJS.js | 4 ++--
src/js/vignettes.js | 1 -
src/js/walkPastJS.js | 1 -
src/js/wombJS.js | 1 -
28 files changed, 16 insertions(+), 35 deletions(-)
diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js
index 0ac6216ffe6..2c0d00d18dd 100644
--- a/src/endWeek/saWorkAGloryHole.js
+++ b/src/endWeek/saWorkAGloryHole.js
@@ -5,9 +5,17 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
let r;
let beauty;
let FResult;
+ /* eslint-disable */
let pronouns;
- // eslint-disable-next-line no-unused-vars
- let he, him, his, hers, himself, boy, He, His;
+ let he;
+ let him;
+ let his;
+ let hers;
+ let himself;
+ let boy;
+ let He;
+ let His;
+ /* eslint-enable */
return saWorkAGloryHole;
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index e5ff99a7a6d..64f7ba2fc4a 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
/**
* Encapsulates the full description of a slave state. Serializable by the SugarCube state
* management.
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 19afaee3dd5..bde11e0e465 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -1,5 +1,4 @@
/* eslint-disable no-case-declarations */
-/* eslint-disable no-undef */
window.assignJob = function assignJob(slave, job) {
"use strict";
const V = State.variables;
diff --git a/src/js/colorModeJS.js b/src/js/colorModeJS.js
index 04ef3f44f8e..bc6d8d7630a 100644
--- a/src/js/colorModeJS.js
+++ b/src/js/colorModeJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
window.flipColors = function (lightColorMap) {
if (!window.savedColorMap) {
window.savedColorMap = setColors(lightColorMap);
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index 2f9d258472c..7939296f091 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -12,7 +12,7 @@ App.Entity.Utils.SlaveDataSchemeCleanup = (function () {
/**
* @param {App.Entity.SlaveState} slave
*/
- function SlaveDataSchemeCleanup(slave) { // eslint-disable-line no-unused-vars
+ function SlaveDataSchemeCleanup(slave) {
migratePorn(slave);
migrateSkills(slave);
migrateCounters(slave);
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index a57180131d3..7b0cb81cea4 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
window.generateRandomEventPoolStandard = function (eventSlave) {
/* STANDARD EVENTS */
diff --git a/src/js/extendedFamilyModeJS.js b/src/js/extendedFamilyModeJS.js
index a42ba83b21f..a8ec7251849 100644
--- a/src/js/extendedFamilyModeJS.js
+++ b/src/js/extendedFamilyModeJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
/* see documentation for details /devNotes/Extended Family Mode Explained.txt */
window.isMotherP = function isMotherP(daughter, mother) {
diff --git a/src/js/familyTreeJS.js b/src/js/familyTreeJS.js
index 53e8e2c2347..7ee477b6e8e 100644
--- a/src/js/familyTreeJS.js
+++ b/src/js/familyTreeJS.js
@@ -1,7 +1,5 @@
/* eslint-disable camelcase */
/* eslint-disable no-console */
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
let lastActiveSlave, lastSlaves, lastPC;
/*
@@ -89,6 +87,7 @@ window.renderFamilyTree = function (slaves, filterID) {
.force('link', d3.forceLink().id(function (d) {
return d.index;
}))
+ // eslint-disable-next-line no-unused-vars
.force('collide', d3.forceCollide(function (d) {
return 60;
}).iterations(4))
diff --git a/src/js/foreachMacroJS.js b/src/js/foreachMacroJS.js
index 12a48d59246..d670f6f911c 100644
--- a/src/js/foreachMacroJS.js
+++ b/src/js/foreachMacroJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
Macro.add('foreach', {
skipArgs: true,
tags: null,
diff --git a/src/js/futureSocietyJS.js b/src/js/futureSocietyJS.js
index 725dd107f8d..dda6f5db263 100644
--- a/src/js/futureSocietyJS.js
+++ b/src/js/futureSocietyJS.js
@@ -1,5 +1,3 @@
-/* eslint-disable no-console */
-/* eslint-disable no-undef */
window.FutureSocieties = (function () {
return {
remove: removeFS,
@@ -15,6 +13,7 @@ window.FutureSocieties = (function () {
const FSSMR = `${FS }SMR`;
let FSLaw = `${FS }Law`;
if (arcology[FS] === undefined) {
+ // eslint-disable-next-line no-console
console.log(`ERROR: bad FS reference, $arcologies[0].${FS} not defined`);
return;
}
diff --git a/src/js/generateNewSlaveJS.js b/src/js/generateNewSlaveJS.js
index 8b584c36c61..e2a509559e9 100644
--- a/src/js/generateNewSlaveJS.js
+++ b/src/js/generateNewSlaveJS.js
@@ -1,5 +1,4 @@
/* eslint-disable camelcase */
-/* eslint-disable no-undef */
window.GenerateNewSlave = (function () {
"use strict";
let V;
diff --git a/src/js/hTagMacroJS.js b/src/js/hTagMacroJS.js
index e9524190a19..be89c63fff6 100644
--- a/src/js/hTagMacroJS.js
+++ b/src/js/hTagMacroJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
/*
* <<htag>> macro
* A simple macro which allows to create wrapping html elements with dynamic IDs.
diff --git a/src/js/heroCreator.js b/src/js/heroCreator.js
index 51fc8409a74..3b19f98cf7d 100644
--- a/src/js/heroCreator.js
+++ b/src/js/heroCreator.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
/**
* @param {App.Entity.SlaveState} heroSlave
* @param {App.Entity.SlaveState} baseHeroSlave
diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index 71ae1cef191..4c473f9baf2 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
/* intended to condense the clothing/toy/etc availability checks into something less asinine */
/**
diff --git a/src/js/optionsMacro.js b/src/js/optionsMacro.js
index 09ec5eb97bf..aef2c03c14f 100644
--- a/src/js/optionsMacro.js
+++ b/src/js/optionsMacro.js
@@ -1,7 +1,5 @@
/* eslint-disable camelcase */
/* eslint-disable no-empty */
-/* eslint-disable no-console */
-/* eslint-disable no-undef */
/* Use like:
<<options $varname "New Passage (defaults to current passage)">>
A title
@@ -49,6 +47,7 @@ Macro.add('options', {
} else if (this.payload[0].args.full.startsWith("State.variables.")) {
variable = "$" + this.payload[0].args.full.split(' ', 1)[0].substring("State.variables.".length);
} else {
+ // eslint-disable-next-line no-console
console.log(this.payload[0].args.full);
throw new Error("First parameter to 'options' must be a variable");
}
diff --git a/src/js/quickListJS.js b/src/js/quickListJS.js
index b86d3e8a4d5..ac0241f18e7 100644
--- a/src/js/quickListJS.js
+++ b/src/js/quickListJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
window.sortDomObjects = function (objects, attrName, reverse = 0) {
reverse = (reverse) ? -1 : 1;
diff --git a/src/js/rbuttonJS.js b/src/js/rbuttonJS.js
index bca16fc0a8f..ca15f2f02b4 100644
--- a/src/js/rbuttonJS.js
+++ b/src/js/rbuttonJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
/* This is modified radiobutton macro, for automatic checked state setup*/
/* Usage (be sure to use quotes around parameters):
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index fc1dc11c3a7..f60c6958020 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1,6 +1,5 @@
/* eslint-disable camelcase */
/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
// rewrite of the rules assistant options page in javascript
// uses an object-oriented widget pattern
// wrapped in a closure so as not to pollute the global namespace
diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 4c2041f25ec..483607e358d 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
window.Beauty = (function () {
"use strict";
let V;
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index ee37f04a7ff..e1f66d5766b 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
window.SlaveStatsChecker = (function () {
return {
checkForLisp: hasLisp,
diff --git a/src/js/spanMacroJS.js b/src/js/spanMacroJS.js
index a5e6f59aece..f2d0fffce30 100644
--- a/src/js/spanMacroJS.js
+++ b/src/js/spanMacroJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
/*
* <<span>> macro
* A minimal macro which allows to create <span> elements with dynamic IDs.
diff --git a/src/js/summaryWidgets.js b/src/js/summaryWidgets.js
index 0f67a230aad..c0dc4cf8e09 100644
--- a/src/js/summaryWidgets.js
+++ b/src/js/summaryWidgets.js
@@ -1,11 +1,8 @@
-/* eslint-disable no-undef */
-/* eslint-disable no-unused-vars */
/**
* @param {App.Entity.SlaveState} slave
*/
window.SlaveStatClamp = function SlaveStatClamp(slave) {
slave.energy = Math.clamp(slave.energy, 0, 100);
- const V = State.variables;
if (slave.devotion > 100) {
if (slave.trust < -95) {
diff --git a/src/js/textInput.js b/src/js/textInput.js
index a7371b2983e..ba89308e4e9 100644
--- a/src/js/textInput.js
+++ b/src/js/textInput.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
Macro.add("textinput", {
// Signifies that the macro is a container macro.
tags: null,
diff --git a/src/js/textboxJS.js b/src/js/textboxJS.js
index cb5213593f7..76ddd8b9b8f 100644
--- a/src/js/textboxJS.js
+++ b/src/js/textboxJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
/* Nicked off greyelf, works for replace textboxes */
window.setReplaceTextboxMaxLength = function (storyVarName, maxLength) {
const textboxId = `#textbox-${ Util.slugify(storyVarName)}`;
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index 117017cc92f..5d0e97b0dff 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1,6 +1,4 @@
/* eslint-disable no-unused-vars */
-/* eslint-disable no-console */
-/* eslint-disable no-undef */
/*
* Height.mean(nationality, race, genes, age) - returns the mean height for the given combination and age in years (>=2)
* Height.mean(nationality, race, genes) - returns the mean adult height for the given combination
@@ -649,9 +647,11 @@ window.Height = (function () {
case "Y0":
case "YY":
case "YYY":
+ // eslint-disable-next-line no-console
console.log(`Height.mean(): non-viable genes ${ genes}`);
break;
default:
+ // eslint-disable-next-line no-console
console.log(`Height.mean(): unknown genes ${ genes }, returning mean between XX and XY`);
result = nationalityMeanHeight(xxMeanHeight, nationality, race) * 0.5 + nationalityMeanHeight(xyMeanHeight, nationality, race) * 0.5;
break;
diff --git a/src/js/vignettes.js b/src/js/vignettes.js
index 62a07b544f8..602652eb705 100644
--- a/src/js/vignettes.js
+++ b/src/js/vignettes.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
/**
* @param {App.Entity.SlaveState} slave
* @returns {string}
diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js
index a5d389ec66e..54e126c2f74 100644
--- a/src/js/walkPastJS.js
+++ b/src/js/walkPastJS.js
@@ -1,5 +1,4 @@
/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
/* temporary container until the entire thing is complete. No point in not deploying the working functions, you know? */
window.primeSlave = function (activeSlave, seed) {
diff --git a/src/js/wombJS.js b/src/js/wombJS.js
index 305455e035b..7c8920080fb 100644
--- a/src/js/wombJS.js
+++ b/src/js/wombJS.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-undef */
/*
This is a womb processor/simulator script. It takes care of calculation of belly sizes based on individual fetus sizes, with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
Design limitations:
--
GitLab