Settings working again

bomberstudios · Oct 22, 2019 · eab1925 · eab1925
1 parent 512ce5e
commit eab1925
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/resources/app.js b/resources/app.js
@@ -15,8 +15,7 @@ let allInputs = []
   allInputs.push(document.getElementById(id))
 })
 
-const populateSettings = () => {
-  if (window.settings === undefined) populateSettings()
+window.populateSettings = () => {
   allInputs.forEach(input => {
     if (input.type === "checkbox") {
       input.checked = window.settings[input.id]
@@ -43,8 +42,6 @@ const generateSettings = () => {
   return obj
 }
 
-populateSettings()
-
 document.getElementById("submit").addEventListener("click", function() {
   window.postMessage('updateSettings', generateSettings())
 })
diff --git a/src/artboard-settings.js b/src/artboard-settings.js
@@ -21,7 +21,7 @@ export function ArtboardSettings(context) {
     width: 350,
     height: 292,
     show: false,
-    resizable: true,
+    resizable: false,
     title: "Artboard Manager — Settings",
     minimizable: false,
     maximizable: false,
@@ -39,9 +39,8 @@ export function ArtboardSettings(context) {
 
   // Get Settings
   webContents.on("did-start-loading", () => {
-    webContents.executeJavaScript(
-      `window.settings=${JSON.stringify(getDefaultSettings())};`
-    )
+    let defaultSettings = getDefaultSettings()
+    webContents.executeJavaScript(`window.settings=${JSON.stringify(defaultSettings)}; populateSettings()`)
   })
 
   // add a handler for a call from web content's javascript
@@ -90,7 +89,7 @@ export function getDefaultSettings() {
     obj[settingsKeys.ARRANGESYMBOLS] = true
     obj[settingsKeys.ARRANGESYMBOLSPAGE] = false
     obj[settingsKeys.EXCLUDEPATTERN] = "--"
-    obj[settingsKeys.ARTBOARDBASENAMES] = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] 
+    obj[settingsKeys.ARTBOARDBASENAMES] = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"]
     obj[settingsKeys.MINIMUMINTEGERDIGITS] = 2
     setSettings(obj)
     return obj