From bbbeec7cfb4adbecf0353b7f2a713f0722fe2f72 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Tue, 23 Apr 2019 18:16:22 +0200
Subject: [PATCH] semis spacing
---
src/js/rbuttonJS.js | 20 ++++++++------------
src/js/relationshipChecks.js | 6 +++---
src/js/rulesAssistant.js | 2 +-
src/js/rulesAssistantOptions.js | 6 +++---
src/js/slaveStatsChecker.js | 4 ++--
src/js/slaveSummaryWidgets.js | 2 +-
6 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/src/js/rbuttonJS.js b/src/js/rbuttonJS.js
index 8c37e7336e3..dfc4bbf6367 100644
--- a/src/js/rbuttonJS.js
+++ b/src/js/rbuttonJS.js
@@ -60,37 +60,33 @@ Macro.add('rbutton', {
*/
jQuery(el)
.attr({
- id : `${this.name}-${varId}-${TempState[this.name][varId]++}`,
- name : `${this.name}-${varId}`,
- type : 'radio',
- tabindex : 0 // for accessibility
+ id: `${this.name}-${varId}-${TempState[this.name][varId]++}`,
+ name: `${this.name}-${varId}`,
+ type: 'radio',
+ tabindex: 0 // for accessibility
})
.addClass(`macro-${this.name}`)
- .on('change', function () {
+ .on('change', function() {
if (this.checked) {
Wikifier.setValue(varName, checkValue);
- if (replaceID.length > 0 && replaceText.length > 0){
-
+ if (replaceID.length > 0 && replaceText.length > 0) {
var replaceEl = document.getElementById(replaceID);
//alert (replaceEl);
if (replaceEl !== null) {
replaceEl.innerHTML = replaceText;
}
-
}
}
})
- .ready (function () {
+ .ready(function() {
//alert ("DOM finished");
- if (el.checked && replaceID.length > 0 && replaceText.length > 0){
-
+ if (el.checked && replaceID.length > 0 && replaceText.length > 0) {
var replaceEl = document.getElementById(replaceID);
//alert (replaceEl);
if (replaceEl !== null) {
replaceEl.innerHTML = replaceText;
}
-
}
})
.appendTo(this.output);
diff --git a/src/js/relationshipChecks.js b/src/js/relationshipChecks.js
index 4c8cd40cee7..6507db75550 100644
--- a/src/js/relationshipChecks.js
+++ b/src/js/relationshipChecks.js
@@ -1,4 +1,4 @@
-window.rivalryTerm = function (id) {
+window.rivalryTerm = function(id) {
if (id.rivalry === 1) {
return `growing rival`;
} else if (id.rivalry === 2) {
@@ -7,7 +7,7 @@ window.rivalryTerm = function (id) {
return `bitter rival`;
}
};
-window.relationshipTerm = function (id) {
+window.relationshipTerm = function(id) {
if (id.relationship === 1) {
return `friend`;
} else if (id.relationship === 2) {
@@ -20,7 +20,7 @@ window.relationshipTerm = function (id) {
return `slave wife`;
}
};
-window.relationshipTermShort = function (id) {
+window.relationshipTermShort = function(id) {
if (id.relationship === 1) {
return `friend`;
} else if (id.relationship === 2) {
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index e7de19f189f..3e5f00e1fed 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -3,7 +3,7 @@
* @param {Object[]} rules
* @returns {boolean}
*/
-window.hasSurgeryRule = function (slave, rules) {
+window.hasSurgeryRule = function(slave, rules) {
return rules.some(
rule => ruleApplied(slave, rule) && rule.set.autoSurgery > 0);
};
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 6def7e4abbd..cb0de4b17f8 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -479,7 +479,7 @@ window.rulesAssistantOptions = (function() {
constructor(root) {
super("Current rule", V.defaultRules.map(i => [i.name, i]));
this.setValue(current_rule.name);
- this.onchange = function (rule) {
+ this.onchange = function(rule) {
V.currentRule = rule.ID;
reload(root);
};
@@ -2271,7 +2271,7 @@ window.rulesAssistantOptions = (function() {
setValue(val) {
if (val === undefined) val = this.combine();
- this.label.innerText = val + " ";
+ this.label.innerText = `${val} `;
current_rule.set.eyeColor = val;
}
}
@@ -3541,7 +3541,7 @@ window.rulesAssistantOptions = (function() {
this.onchange = (value) => current_rule.set.surgery_holes = value;
}
}
-
+
class TummyTuckSurgeryList extends List {
constructor() {
const items = [
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index 2ecea065d79..6381032237a 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -156,7 +156,7 @@ window.SlaveStatsChecker = (function() {
}
}());
-window.isSlim = /** @param {App.Entity.SlaveState} slave */ function (slave) {
+window.isSlim = /** @param {App.Entity.SlaveState} slave */ function(slave) {
let slim = false;
const ArcologyZero = State.variables.arcologies[0];
@@ -184,7 +184,7 @@ window.isSlim = /** @param {App.Entity.SlaveState} slave */ function (slave) {
return slim;
};
-window.slimPass = /** @param {App.Entity.SlaveState} slave */ function (slave) {
+window.slimPass = /** @param {App.Entity.SlaveState} slave */ function(slave) {
let slimPass = 0;
const ArcologyZero = State.variables.arcologies[0];
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 66540c34f0b..83044ab262c 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -5179,7 +5179,7 @@ App.UI.slaveSummaryList = function(passageName) {
let rejectString = rejects.length === 1 ?
rejects[0]:
`${_slaveName}: <ul>${rejects.map(e => `<li>${e}</li>`).join('')}</ul>`;
- res.push(rejectString + '</div>');
+ res.push(`${rejectString}</div>`);
continue;
} else {
res.push(dividerAndImage(_Slave));
--
GitLab