From 434af8542aed80446bc7de5a79708ed57d61eb83 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Tue, 23 Apr 2019 18:22:18 +0200
Subject: [PATCH] padded blocks, spacing
---
src/js/PenthouseNaming.js | 16 ++++++++--------
src/js/optionsMacro.js | 4 +---
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/js/PenthouseNaming.js b/src/js/PenthouseNaming.js
index 2df44f652f0..6e85f6ab59a 100644
--- a/src/js/PenthouseNaming.js
+++ b/src/js/PenthouseNaming.js
@@ -1,7 +1,7 @@
/**
* @return {string}
*/
-window.MasterSuiteUIName = function () {
+window.MasterSuiteUIName = function() {
const V = State.variables;
const name = (V.masterSuiteNameCaps === "The Master Suite") ? "Master Suite" : V.masterSuiteNameCaps;
return `<<link "${name}""Master Suite">><</link>> `;
@@ -10,7 +10,7 @@ window.MasterSuiteUIName = function () {
/**
* @return {string}
*/
-window.HeadGirlSuiteUIName = function () {
+window.HeadGirlSuiteUIName = function() {
const V = State.variables;
const name = (V.HGSuiteNameCaps === "The Head Girl Suite") ? "Head Girl Suite" : V.HGSuiteNameCaps;
return `<<link "${name}""Head Girl Suite">><</link>> `;
@@ -19,7 +19,7 @@ window.HeadGirlSuiteUIName = function () {
/**
* @return {string}
*/
-window.ServantQuartersUIName = function () {
+window.ServantQuartersUIName = function() {
const V = State.variables;
const name = (V.servantsQuartersNameCaps === "The Servants' Quarters") ? "Servants' Quarters" : V.servantsQuartersNameCaps;
return `<<link "${name}""Servants' Quarters">><</link>> `;
@@ -37,7 +37,7 @@ window.SpaUIName = function() {
/**
* @return {string}
*/
-window.NurseryUIName = function () {
+window.NurseryUIName = function() {
const V = State.variables;
const name = (V.nurseryNameCaps === "The Nursery") ? "Nursery" : V.nurseryNameCaps;
return `<<link "${name}""Nursery">><</link>> `;
@@ -46,7 +46,7 @@ window.NurseryUIName = function () {
/**
* @return {string}
*/
-window.ClinicUIName = function () {
+window.ClinicUIName = function() {
const V = State.variables;
const name = (V.clinicNameCaps === "The Clinic") ? "Clinic" : V.clinicNameCaps;
return `<<link "${name}""Clinic">><</link>> `;
@@ -55,7 +55,7 @@ window.ClinicUIName = function () {
/**
* @return {string}
*/
-window.SchoolRoomUIName = function () {
+window.SchoolRoomUIName = function() {
const V = State.variables;
const name = (V.schoolroomNameCaps === "The Schoolroom") ? "Schoolroom" : V.schoolroomNameCaps;
return `<<link "${name}""Schoolroom">><</link>> `;
@@ -64,7 +64,7 @@ window.SchoolRoomUIName = function () {
/**
* @return {string}
*/
-window.CellblockUIName = function () {
+window.CellblockUIName = function() {
const V = State.variables;
const name = (V.cellblockNameCaps === "The Cellblock") ? "Cellblock" : V.cellblockNameCaps;
return `<<link "${name}""Cellblock">><</link>> `;
@@ -73,7 +73,7 @@ window.CellblockUIName = function () {
/**
* @return {string}
*/
-window.IncubatorUIName = function () {
+window.IncubatorUIName = function() {
const V = State.variables;
const name = (V.incubatorNameCaps === "The Incubator") ? "Incubator" : V.incubatorNameCaps;
return `<<link "${name}""Incubator">><</link>> `;
diff --git a/src/js/optionsMacro.js b/src/js/optionsMacro.js
index 25de71e2e3c..8f20091d84b 100644
--- a/src/js/optionsMacro.js
+++ b/src/js/optionsMacro.js
@@ -21,7 +21,7 @@ Macro.add('options', {
skipArgs : false,
tags : ['option', 'comment', 'optionlt', 'optionlte', 'optiongt', 'optiongte',
'optiondefault', 'optionif'],
- handler : function () {
+ handler : function() {
try {
var currentOption = this.payload[0].args[0];
var currentOptionIsNumber = typeof currentOption === "number";
@@ -111,9 +111,7 @@ Macro.add('options', {
} else {
throw new Error("Missing variable to <<options>>");
}
-
}
-
}
var showSelectedOption = true; //this.payload.length !== 3 || !description;
--
GitLab