From c8388fe9f8c920531a8a32ef22ed51428547ad8f Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 13 Aug 2020 22:21:31 -0400
Subject: [PATCH] kabobs
---
src/Corporation/corporateWidgets.tw | 4 +--
.../BackwardsCompatibility.tw | 2 +-
.../backwardsCompatibility.js | 22 +++++++-------
src/debugging/debugWidgets.tw | 4 +--
src/facilities/nursery/nursery.tw | 14 ++++-----
src/facilities/nursery/utils/nurseryUtils.js | 30 +++++++++----------
src/gui/options/options.tw | 4 +--
src/js/quickListJS.js | 16 +++++-----
8 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/src/Corporation/corporateWidgets.tw b/src/Corporation/corporateWidgets.tw
index ebfed4c164c..14e57d4a754 100644
--- a/src/Corporation/corporateWidgets.tw
+++ b/src/Corporation/corporateWidgets.tw
@@ -57,12 +57,12 @@ Usage:
<td>Liquidity</td>
<td>
<<if ($cheatMode) && ($cheatModeM)>>
- <span id="corpCash"><<= cashFormatColor(App.Corporate.cash)>></span>
+ <span id="corp-cash"><<= cashFormatColor(App.Corporate.cash)>></span>
<<set _tCorpCash = App.Corporate.cash>>
<<textbox "_tCorpCash" _tCorpCash>>
<<link "Apply">>
<<set App.Corporate.cheatCash(_tCorpCash)>>
- <<replace "#corpCash">><<= cashFormatColor(App.Corporate.cash)>><</replace>>
+ <<replace "#corp-cash">><<= cashFormatColor(App.Corporate.cash)>><</replace>>
<</link>>
<<else>>
<<= cashFormatColor(App.Corporate.cash)>>
diff --git a/src/data/backwardsCompatibility/BackwardsCompatibility.tw b/src/data/backwardsCompatibility/BackwardsCompatibility.tw
index 1e4b86c77fe..0a3ff856077 100644
--- a/src/data/backwardsCompatibility/BackwardsCompatibility.tw
+++ b/src/data/backwardsCompatibility/BackwardsCompatibility.tw
@@ -6,7 +6,7 @@
/* resetOnNGPlus contains half of the variables we need, but we use it politely here instead of forcing it so it fills in holes instead of overwriting data */
<<run App.Update.setNonexistentProperties(V, App.Data.resetOnNGPlus)>>
-<span id="backwardsCompatibility"></span>
+<span id="backwards-compatibility"></span>
<script>
App.Update.backwardsCompatibility();
</script>
\ No newline at end of file
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 31c60b45cfc..4a83fd41880 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -56,42 +56,42 @@ App.Update.setExistentProperties = function(obj, array) {
App.Update.backwardsCompatibility = function() {
let div;
- jQuery('#backwardsCompatibility').empty();
+ jQuery('#backwards-compatibility').empty();
try {
div = document.createElement('div');
div.append(`Check for old version... `);
- jQuery('#backwardsCompatibility').append(div);
+ jQuery('#backwards-compatibility').append(div);
App.Update.oldVersions(div);
div = document.createElement('div');
div.append(`Updating gene pool records... `);
- jQuery('#backwardsCompatibility').append(div);
+ jQuery('#backwards-compatibility').append(div);
App.Update.genePoolRecords(div);
div = document.createElement('div');
div.append(`Updating global variables... `);
- jQuery('#backwardsCompatibility').append(div);
+ jQuery('#backwards-compatibility').append(div);
App.Update.globalVariables(div);
div = document.createElement('div');
div.append(`Updating slave variables... `);
- jQuery('#backwardsCompatibility').append(div);
+ jQuery('#backwards-compatibility').append(div);
App.Update.slaveVariables(div);
div = document.createElement('div');
div.append(`Updating slave records... `);
- jQuery('#backwardsCompatibility').append(div);
+ jQuery('#backwards-compatibility').append(div);
App.Update.slaveRecords(div);
div = document.createElement('div');
div.append(`Updating Rule Assistant data... `);
- jQuery('#backwardsCompatibility').append(div);
+ jQuery('#backwards-compatibility').append(div);
App.Update.RAassistantData(div);
// Sec Exp
div = document.createElement('div');
div.append(`Updating Security Expansion... `);
- jQuery('#backwardsCompatibility').append(div);
+ jQuery('#backwards-compatibility').append(div);
App.SecExp.generalBC();
if (V.secExpEnabled > 0) {
div.append(App.UI.DOM.renderPassage("SecExpBackwardCompatibility"));
@@ -99,20 +99,20 @@ App.Update.backwardsCompatibility = function() {
div = document.createElement('div');
div.append(`Checking for old variables... `);
- jQuery('#backwardsCompatibility').append(div);
+ jQuery('#backwards-compatibility').append(div);
App.Update.autoshred(div);
// leave this at the bottom of BC
div = document.createElement('div');
div.append(`Cleaning up... `);
- jQuery('#backwardsCompatibility').append(div);
+ jQuery('#backwards-compatibility').append(div);
App.Update.cleanUp(div);
App.UI.SlaveSummary.settingsChanged();
} catch (error) {
div = document.createElement('p');
div.className = "red";
div.textContent = `Backwards compatibility has failed for your save. Please upload your save to https://gitgud.io/pregmodfan/fc-pregmod/ with notes on what went wrong so that we can fix the backwards compatibility process for everyone. Thank you!`;
- jQuery('#backwardsCompatibility').append(div);
+ jQuery('#backwards-compatibility').append(div);
State.restore();
throw (error); // rethrow the exception to SugarCube so we get a fancy stack trace
}
diff --git a/src/debugging/debugWidgets.tw b/src/debugging/debugWidgets.tw
index 4cf0f2cefe4..7537a9eee2d 100644
--- a/src/debugging/debugWidgets.tw
+++ b/src/debugging/debugWidgets.tw
@@ -27,9 +27,9 @@ Differences:
<br> Variable: <<print _diffArrayFromNew[_i].variable>>, Original Value: <<print _diffArrayFromNew[_i].oldVal>>, New Value: <<print _diffArrayFromNew[_i].newVal>>
<</if>>
<</for>><br>
- <span id="extraInfo">
+ <span id="extra-info">
<<link "Show more">>
- <<replace "#extraInfo">>
+ <<replace "#extra-info">>
Alternate display:
<<for _i = 0; _i < _diffArrayFromOld.length; _i++>> /* Print variable names, and changed values. Will output the old values correctly, may not output new values correctly */
<<if _diffArrayFromOld[_i].variable != "nextButton" && _diffArrayFromOld[_i].variable != "nextLink" && _diffArrayFromOld[_i].variable != "args">>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 01b3b0cfddc..6839ea7c9e4 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -168,38 +168,38 @@
<span class="note">
Sorting:
</span>
- ''<span id="qlNurserySort">$sortNurseryList</span>.''
+ ''<span id="ql-nursery-sort">$sortNurseryList</span>.''
<<link "Sort by Name">>
<<set $sortNurseryList = 'Name'>>
- <<replace "#qlNurserySort">>$sortNurseryList<</replace>>
+ <<replace "#ql-nursery-sort">>$sortNurseryList<</replace>>
<<script>>
sortNurseryPossiblesByName();
<</script>>
<</link>> |
<<link "Sort by Reserved Nursery Spots">>
<<set $sortNurseryList = 'Reserved Nursery Spots'>>
- <<replace "#qlNurserySort">>$sortNurseryList<</replace>>
+ <<replace "#ql-nursery-sort">>$sortNurseryList<</replace>>
<<script>>
sortNurseryPossiblesByReservedSpots();
<</script>>
<</link>> |
<<link "Sort by Pregnancy Week">>
<<set $sortNurseryList = 'Pregnancy Week'>>
- <<replace "#qlNurserySort">>$sortNurseryList<</replace>>
+ <<replace "#ql-nursery-sort">>$sortNurseryList<</replace>>
<<script>>
sortNurseryPossiblesByPregnancyWeek();
<</script>>
<</link>> |
<<link "Sort by Number of Children">>
<<set $sortNurseryList = 'Number of Children'>>
- <<replace "#qlNurserySort">>$sortNurseryList<</replace>>
+ <<replace "#ql-nursery-sort">>$sortNurseryList<</replace>>
<<script>>
sortNurseryPossiblesByPregnancyCount();
<</script>>
<</link>>
<br>
<</if>>
- <div id="qlNursery">
+ <div id="ql-nursery">
<<for _u = 0; _u < _SL; _u++>>
<<setLocalPronouns $slaves[_u]>>
<<if $slaves[_u].preg > 0 && $slaves[_u].broodmother == 0 && $slaves[_u].pregKnown == 1 && $slaves[_u].eggType == "human">>
@@ -285,7 +285,7 @@
<</for>>
</div>
<<script>>
- $('div#qlNursery').ready(sortNurseryPossiblesByPreviousSort);
+ $('div#ql-nursery').ready(sortNurseryPossiblesByPreviousSort);
<</script>>
</div>
</div>
diff --git a/src/facilities/nursery/utils/nurseryUtils.js b/src/facilities/nursery/utils/nurseryUtils.js
index 9dbbca81354..d733eda01cb 100644
--- a/src/facilities/nursery/utils/nurseryUtils.js
+++ b/src/facilities/nursery/utils/nurseryUtils.js
@@ -719,14 +719,14 @@ App.Facilities.Nursery.nurserySort = function nurserySort() {
nurseryHasReservedChildren = false,
reservedChildrenNursery = FetusGlobalReserveCount("nursery");
- r += `<br><i>Sorting:</i> <b><span id="qlNurserySort">${sortNurseryList}</span>.</b> `;
- r += `${App.UI.passageLink("Sort by Name", "Nursery", `${sortNurseryList = "Name"}, ${App.UI.replace(`#qlNurserySort`, sortNurseryList)}, ${byName()}`)} | `;
- r += `${App.UI.passageLink("Sort by Reserved Nursery Spots", "Nursery", `${sortNurseryList = "Reserved Nursery Spots"}, ${App.UI.replace(`#qlNurserySort`)} ${sortNurseryList}, ${byReservedSpots()}`)} | `;
- r += `${App.UI.passageLink("Sort by Pregnancy Week", "Nursery", `${sortNurseryList = "Pregnancy Week"}, ${App.UI.replace(`#qlNurserySort`, sortNurseryList)}, ${byPregnancyWeek()}`)} | `;
- r += `${App.UI.passageLink("Sort by Number of Children", "Nursery", `${sortNurseryList = "Number of Children"}, ${App.UI.replace(`#qlNurserySort`, sortNurseryList)}, ${byPregnancyCount()}`)}`;
+ r += `<br><i>Sorting:</i> <b><span id="ql-nursery-sort">${sortNurseryList}</span>.</b> `;
+ r += `${App.UI.passageLink("Sort by Name", "Nursery", `${sortNurseryList = "Name"}, ${App.UI.replace(`#ql-nursery-sort`, sortNurseryList)}, ${byName()}`)} | `;
+ r += `${App.UI.passageLink("Sort by Reserved Nursery Spots", "Nursery", `${sortNurseryList = "Reserved Nursery Spots"}, ${App.UI.replace(`#ql-nursery-sort`)} ${sortNurseryList}, ${byReservedSpots()}`)} | `;
+ r += `${App.UI.passageLink("Sort by Pregnancy Week", "Nursery", `${sortNurseryList = "Pregnancy Week"}, ${App.UI.replace(`#ql-nursery-sort`, sortNurseryList)}, ${byPregnancyWeek()}`)} | `;
+ r += `${App.UI.passageLink("Sort by Number of Children", "Nursery", `${sortNurseryList = "Number of Children"}, ${App.UI.replace(`#ql-nursery-sort`, sortNurseryList)}, ${byPregnancyCount()}`)}`;
r += `<br>`;
- r += `<div id="qlNursery">`;
+ r += `<div id="ql-nursery">`;
for (let i = 0; i < SL; i++) {
const slave = V.slaves[i];
@@ -845,7 +845,7 @@ App.Facilities.Nursery.nurserySort = function nurserySort() {
r += `</div>`;
- $('div#qlNursery').ready(byPreviousSort);
+ $('div#ql-nursery').ready(byPreviousSort);
if (!eligibility) {
r += `<br>`;
@@ -919,27 +919,27 @@ App.Facilities.Nursery.nurserySort = function nurserySort() {
}
function byName() {
- let sortedNurseryPossibles = $('#qlNursery div.possible').detach();
+ let sortedNurseryPossibles = $('#ql-nursery div.possible').detach();
sortedNurseryPossibles = sortDomObjects(sortedNurseryPossibles, 'data-name');
- $(sortedNurseryPossibles).appendTo($('#qlNursery'));
+ $(sortedNurseryPossibles).appendTo($('#ql-nursery'));
}
function byReservedSpots() {
- let sortedNurseryPossibles = $('#qlNursery div.possible').detach();
+ let sortedNurseryPossibles = $('#ql-nursery div.possible').detach();
sortedNurseryPossibles = sortDomObjects(sortedNurseryPossibles, 'data-reserved-spots');
- $(sortedNurseryPossibles).appendTo($('#qlNursery'));
+ $(sortedNurseryPossibles).appendTo($('#ql-nursery'));
}
function byPregnancyWeek() {
- let sortedNurseryPossibles = $('#qlNursery div.possible').detach();
+ let sortedNurseryPossibles = $('#ql-nursery div.possible').detach();
sortedNurseryPossibles = sortDomObjects(sortedNurseryPossibles, 'data-preg-week');
- $(sortedNurseryPossibles).appendTo($('#qlNursery'));
+ $(sortedNurseryPossibles).appendTo($('#ql-nursery'));
}
function byPregnancyCount() {
- let sortedNurseryPossibles = $('#qlNursery div.possible').detach();
+ let sortedNurseryPossibles = $('#ql-nursery div.possible').detach();
sortedNurseryPossibles = sortDomObjects(sortedNurseryPossibles, 'data-preg-count');
- $(sortedNurseryPossibles).appendTo($('#qlNursery'));
+ $(sortedNurseryPossibles).appendTo($('#ql-nursery'));
}
function byPreviousSort() {
diff --git a/src/gui/options/options.tw b/src/gui/options/options.tw
index d955bfbaa31..8be4120ed3b 100644
--- a/src/gui/options/options.tw
+++ b/src/gui/options/options.tw
@@ -41,9 +41,9 @@
</div>
<<link "Reset extended family mode controllers">>
<<run resetFamilyCounters()>>
- <<replace "#familyHint">>//@@.lightgreen;Done:@@ all family relations flushed and rebuilt.//<</replace>>
+ <<replace "#family-hint">>//@@.lightgreen;Done:@@ all family relations flushed and rebuilt.//<</replace>>
<</link>>
-<span id="familyHint">//Clears and rebuilds .sister and .daughter tracking.//</span>
+<span id="family-hint">//Clears and rebuilds .sister and .daughter tracking.//</span>
<<if isNaN($rep)>>
<br>[[Reset Reputation|Options][$rep = 0]]
<</if>>
diff --git a/src/js/quickListJS.js b/src/js/quickListJS.js
index 7a5f3757026..9b37d48e85a 100644
--- a/src/js/quickListJS.js
+++ b/src/js/quickListJS.js
@@ -86,27 +86,27 @@ globalThis.sortIncubatorPossiblesByPreviousSort = function() {
};
globalThis.sortNurseryPossiblesByName = function() {
- let $sortedNurseryPossibles = $('#qlNursery div.possible').detach();
+ let $sortedNurseryPossibles = $('#ql-nursery div.possible').detach();
$sortedNurseryPossibles = sortDomObjects($sortedNurseryPossibles, 'data-name');
- $($sortedNurseryPossibles).appendTo($('#qlNursery'));
+ $($sortedNurseryPossibles).appendTo($('#ql-nursery'));
};
globalThis.sortNurseryPossiblesByPregnancyWeek = function() {
- let $sortedNurseryPossibles = $('#qlNursery div.possible').detach();
+ let $sortedNurseryPossibles = $('#ql-nursery div.possible').detach();
$sortedNurseryPossibles = sortDomObjects($sortedNurseryPossibles, 'data-preg-week');
- $($sortedNurseryPossibles).appendTo($('#qlNursery'));
+ $($sortedNurseryPossibles).appendTo($('#ql-nursery'));
};
globalThis.sortNurseryPossiblesByPregnancyCount = function() {
- let $sortedNurseryPossibles = $('#qlNursery div.possible').detach();
+ let $sortedNurseryPossibles = $('#ql-nursery div.possible').detach();
$sortedNurseryPossibles = sortDomObjects($sortedNurseryPossibles, 'data-preg-count');
- $($sortedNurseryPossibles).appendTo($('#qlNursery'));
+ $($sortedNurseryPossibles).appendTo($('#ql-nursery'));
};
globalThis.sortNurseryPossiblesByReservedSpots = function() {
- let $sortedNurseryPossibles = $('#qlNursery div.possible').detach();
+ let $sortedNurseryPossibles = $('#ql-nursery div.possible').detach();
$sortedNurseryPossibles = sortDomObjects($sortedNurseryPossibles, 'data-reserved-spots');
- $($sortedNurseryPossibles).appendTo($('#qlNursery'));
+ $($sortedNurseryPossibles).appendTo($('#ql-nursery'));
};
globalThis.sortNurseryPossiblesByPreviousSort = function() {
--
GitLab