bundle settings together

.minify.json

···
     "terser": {
       "mangle": {
         "toplevel": true,
-        "reserved": ["pushToast", "addKeyboardListener", "addEasyModalOpen",
-        "addClickKeyboardListener", "addKeyboardListener",
-        "addUsernameFieldWatchers", "translateErrorObject", "easySetup",
-        "clearSettingsData", "openAltText", "openPostAltEditor"]
+        "reserved": ["pushToast", "addKeyboardListener",
+        "addClickKeyboardListener", "easySetup",
+        "addUsernameFieldWatchers", "translateErrorObject",
+        "openAltText", "openPostAltEditor"]
       }
     },
     "putout": {

assets/js/appHelper.js

···
   counterEl.dispatchEvent(new Event("reset"));
 }
 
-function addEasyModalOpen(buttonID, modalEl, closeButtonID=null) {
-  addClickKeyboardListener(document.getElementById(buttonID), () => {
-    clearSettingsData();
-    openModal(modalEl);
-  });
-  if (closeButtonID !== null) {
-    addClickKeyboardListener(document.getElementById(closeButtonID), () => {
-      closeModal(modalEl);
-    });
-  }
-}
-
 function setElementRequired(el, required) {
   if (required)
     el.setAttribute("required", true);

assets/js/settings.js assets/js/settingsHelper.js

···
   document.getElementById("accountDeleteResponse").innerHTML = "";
 }
 
+function addEasyModalOpen(buttonID, modalEl, closeButtonID=null) {
+  addClickKeyboardListener(document.getElementById(buttonID), () => {
+    clearSettingsData();
+    openModal(modalEl);
+  });
+  if (closeButtonID !== null) {
+    addClickKeyboardListener(document.getElementById(closeButtonID), () => {
+      closeModal(modalEl);
+    });
+  }
+}
+
 document.addEventListener("violationOpenSettings", () => {
   if (document.getElementById("violationSettingsLink")) {
     addEasyModalOpen("violationSettingsLink", document.getElementById("changeInfo"));

package.json

···
     "migrate:all": "npm run migrate:local && npm run migrate:prod",
     "minify:js:main": "minify assets/js/main.js > assets/js/main.min.js",
     "minify:js:app": "cat assets/js/*Helper.js | minify --js > assets/js/app.min.js",
-    "minify:js:settings": "minify assets/js/settings.js > assets/js/settings.min.js",
     "minify:style:site": "minify assets/css/stylesheet.css > assets/css/stylesheet.min.css",
     "minify:style:dash": "minify assets/css/dashboard.css > assets/css/dashboard.min.css",
     "minify:js": "run-p minify:js:**",

src/layout/dialogs/settingsDialog.tsx

···
 import { MAX_DASHBOARD_PASS, MIN_DASHBOARD_PASS } from "../../limits";
 import { APP_NAME } from "../../siteinfo";
 import { PWAutoCompleteSettings } from "../../types";
-import { settingsScriptStr } from "../../utils/appScripts";
 import BSkyAppPasswordField from "../fields/appPasswordField";
 import DashboardPasswordField from "../fields/dashPasswordField";
 import UsernameField from "../fields/usernameField";
···
       </footer>
     </article>
   </dialog>
-  <script type="text/javascript" src={settingsScriptStr}></script>
   </>);
 }

src/pages/dashboard.tsx

···
 import { ScheduledPostList } from "../layout/postList";
 import { ViolationNoticeBar } from "../layout/violationsBar";
 import { APP_NAME, DASHBOARD_TAG_LINE, SHOW_SUPPORT_PROGRESS_BAR } from "../siteinfo";
-import {
-  dashboardScriptStr,
-  dashboardStyleStr,
-  settingsScriptStr
-} from "../utils/appScripts";
+import { dashboardScriptStr, dashboardStyleStr } from "../utils/appScripts";
 
 export default function Dashboard(props: any) {
   const ctx: Context = props.c;
···
     {href: "/dep/tabs.min.js", type: "script"}
   ];
 
-  // Our own homebrew js files
-  const dashboardScripts: PreloadRules[] = [dashboardScriptStr, settingsScriptStr].map((itm) => {
-    return {href: itm, type: "script"};
-  });
   return (<BaseLayout title="Dashboard" mainClass="dashboard"
-      preloads={[...PreloadPostCreation, ...defaultDashboardPreloads, ...dashboardScripts]}>
+      preloads={[...PreloadPostCreation, ...defaultDashboardPreloads, {href: dashboardScriptStr, type: "script"}]}>
     <IncludeDependencyTags scripts={defaultDashboardPreloads} />
     <div class="row-fluid">
       <section class="col-3 sidebar">
···
       </div>
     </div>
     <AltTextDialog />
-    <script type="text/javascript" src={dashboardScriptStr}></script>
     <SettingsDialog pds={ctx.get("pds")} />
+    <script type="text/javascript" src={dashboardScriptStr}></script>
   </BaseLayout>);
 };

src/utils/appScripts.ts

···
 // Change this value to break out of any caching that might be happening
 // for the runtime scripts (ex: main.js & postHelper.js)
-export const CURRENT_SCRIPT_VERSION: string = "1.7.17";
+export const CURRENT_SCRIPT_VERSION: string = "1.7.18";
 
 export const getAppScriptStr = (scriptName: string, ext: string="js") =>
   `/${ext}/${scriptName}.min.${ext}?v=${CURRENT_SCRIPT_VERSION}`;
···
 // Eventually make this automatically generated.
 export const mainScriptStr: string = getAppScriptStr("main");
 export const dashboardScriptStr: string = getAppScriptStr("app");
-export const settingsScriptStr: string = getAppScriptStr("settings");
 export const dashboardStyleStr: string = getAppScriptStr("dashboard", "css");