From e9c7671c03a13447d8fd80f26872df472b71591f Mon Sep 17 00:00:00 2001
From: DCoded <dicoded@email.com>
Date: Sun, 16 Jan 2022 16:57:43 -0500
Subject: [PATCH] Made name argument optional
---
devTools/types/FC/facilities.d.ts | 2 +-
src/facilities/dairy/dairy.js | 13 -------------
src/gui/options/optionsGroup.js | 4 +++-
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/devTools/types/FC/facilities.d.ts b/devTools/types/FC/facilities.d.ts
index 74976994de2..fc65a86be8f 100644
--- a/devTools/types/FC/facilities.d.ts
+++ b/devTools/types/FC/facilities.d.ts
@@ -69,7 +69,7 @@ declare namespace FC {
/** The content displayed in the dialog. */
content: string|HTMLElement|DocumentFragment;
/** The name of the dialog to display. */
- name: string;
+ name?: string;
};
}>
/** Any additional nodes to attach. */
diff --git a/src/facilities/dairy/dairy.js b/src/facilities/dairy/dairy.js
index cf7ceb07d45..68db48f927e 100644
--- a/src/facilities/dairy/dairy.js
+++ b/src/facilities/dairy/dairy.js
@@ -406,7 +406,6 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
link: `Deactivate`,
value: 0,
dialog: {
- name: V.dairyName,
content: this._getEffect('feeders'),
},
},
@@ -415,7 +414,6 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
link: `Moderate`,
value: 1,
dialog: {
- name: V.dairyName,
content: this._getEffect('feeders'),
},
},
@@ -424,7 +422,6 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
link: `Industrial`,
value: 2,
dialog: {
- name: V.dairyName,
content: this._getEffect('feeders'),
},
prereqs: [
@@ -444,7 +441,6 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
link: `Not for hire`,
value: 0,
dialog: {
- name: V.dairyName,
content: this._getEffect('preg'),
},
},
@@ -453,7 +449,6 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
link: `Moderate`,
value: 1,
dialog: {
- name: V.dairyName,
content: this._getEffect('preg'),
},
},
@@ -462,7 +457,6 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
link: `Industrial`,
value: 2,
dialog: {
- name: V.dairyName,
content: this._getEffect('preg'),
},
prereqs: [
@@ -474,7 +468,6 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
link: `Mass production`,
value: 3,
dialog: {
- name: V.dairyName,
content: this._getEffect('preg'),
},
prereqs: [
@@ -497,7 +490,6 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
link: `Deactivate`,
value: 0,
dialog: {
- name: V.dairyName,
content: this._getEffect('stimulators'),
},
},
@@ -506,7 +498,6 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
link: `Moderate`,
value: 1,
dialog: {
- name: V.dairyName,
content: this._getEffect('stimulators'),
},
},
@@ -515,7 +506,6 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
link: `Industrial`,
value: 2,
dialog: {
- name: V.dairyName,
content: this._getEffect('stimulators'),
},
prereqs: [
@@ -536,7 +526,6 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
link: `Deactivate`,
value: 0,
dialog: {
- name: V.dairyName,
content: this._getEffect('restraints'),
},
},
@@ -545,7 +534,6 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
link: `Free range`,
value: 1,
dialog: {
- name: V.dairyName,
content: this._getEffect('restraints'),
},
},
@@ -554,7 +542,6 @@ App.Facilities.Dairy.dairy = class Dairy extends App.Facilities.Facility {
link: `Permanent machine milking`,
value: 2,
dialog: {
- name: V.dairyName,
content: this._getEffect('restraints'),
},
},
diff --git a/src/gui/options/optionsGroup.js b/src/gui/options/optionsGroup.js
index 7bbc90430e0..6274b50693e 100644
--- a/src/gui/options/optionsGroup.js
+++ b/src/gui/options/optionsGroup.js
@@ -587,7 +587,9 @@ App.UI.OptionsGroup = (function() {
if (Dialog.isOpen()) {
Dialog.close();
}
- Dialog.setup(this.dialog.name);
+ if (this.dialog.name) {
+ Dialog.setup(this.dialog.name);
+ }
const frag = new DocumentFragment();
frag.append(this.dialog.content);
$(Dialog.body()).empty().append(frag);
--
GitLab